From 4dab60f0be3120f42fcea5b1d6cad6e8a300d758 Mon Sep 17 00:00:00 2001 From: Sarah Thompson Date: Thu, 5 Oct 2023 15:24:12 +0100 Subject: [PATCH 1/3] Update ci.hcl This update, moves consul-k8s to use the prepare workflow. This workflow encapsulates several previous workflows, running jobs in parallel to reduce the artifact processing time. See https://hashicorp.atlassian.net/wiki/spaces/RELENG/pages/2489712686/Dec+7th+2022+-+Introducing+the+new+Prepare+workflow for more info. --- .release/ci.hcl | 139 ++---------------------------------------------- 1 file changed, 5 insertions(+), 134 deletions(-) diff --git a/.release/ci.hcl b/.release/ci.hcl index c5cb5b96f..c202d68f1 100644 --- a/.release/ci.hcl +++ b/.release/ci.hcl @@ -33,67 +33,13 @@ event "build" { } } -event "upload-dev" { +event "prepare" { depends = ["build"] - action "upload-dev" { + action "prepare" { organization = "hashicorp" - repository = "crt-workflows-common" - workflow = "upload-dev" - depends = ["build"] - } - - notification { - on = "fail" - } -} - -event "security-scan-binaries" { - depends = ["upload-dev"] - action "security-scan-binaries" { - organization = "hashicorp" - repository = "crt-workflows-common" - workflow = "security-scan-binaries" - config = "security-scan.hcl" - } - - notification { - on = "fail" - } -} - -event "security-scan-containers" { - depends = ["security-scan-binaries"] - action "security-scan-containers" { - organization = "hashicorp" - repository = "crt-workflows-common" - workflow = "security-scan-containers" - config = "security-scan.hcl" - } - - notification { - on = "fail" - } -} - -event "notarize-darwin-amd64" { - depends = ["security-scan-containers"] - action "notarize-darwin-amd64" { - organization = "hashicorp" - repository = "crt-workflows-common" - workflow = "notarize-darwin-amd64" - } - - notification { - on = "fail" - } -} - -event "notarize-windows-386" { - depends = ["notarize-darwin-amd64"] - action "notarize-windows-386" { - organization = "hashicorp" - repository = "crt-workflows-common" - workflow = "notarize-windows-386" + repository = "crt-workflows-common" + workflow = "prepare" + depends = ["build"] } notification { @@ -101,81 +47,6 @@ event "notarize-windows-386" { } } -event "notarize-windows-amd64" { - depends = ["notarize-windows-386"] - action "notarize-windows-amd64" { - organization = "hashicorp" - repository = "crt-workflows-common" - workflow = "notarize-windows-amd64" - } - - notification { - on = "fail" - } -} - -event "sign" { - depends = ["notarize-windows-amd64"] - action "sign" { - organization = "hashicorp" - repository = "crt-workflows-common" - workflow = "sign" - } - - notification { - on = "fail" - } -} - -event "sign-linux-rpms" { - depends = ["sign"] - action "sign-linux-rpms" { - organization = "hashicorp" - repository = "crt-workflows-common" - workflow = "sign-linux-rpms" - } - - notification { - on = "fail" - } -} - -event "verify" { - depends = ["sign-linux-rpms"] - action "verify" { - organization = "hashicorp" - repository = "crt-workflows-common" - workflow = "verify" - } - - notification { - on = "always" - } -} - -event "promote-dev-docker" { - depends = ["verify"] - action "promote-dev-docker" { - organization = "hashicorp" - repository = "crt-workflows-common" - workflow = "promote-dev-docker" - depends = ["verify"] - } - - notification { - on = "fail" - } -} - -event "fossa-scan" { - depends = ["promote-dev-docker"] - action "fossa-scan" { - organization = "hashicorp" - repository = "crt-workflows-common" - workflow = "fossa-scan" - } -} - ## These are promotion and post-publish events ## they should be added to the end of the file after the verify event stanza. From 9366c70896006ad0e5c39087d3aaf1adf35b413e Mon Sep 17 00:00:00 2001 From: Sarah Thompson Date: Thu, 5 Oct 2023 15:25:50 +0100 Subject: [PATCH 2/3] Update ci.hcl add branch for testing --- .release/ci.hcl | 1 + 1 file changed, 1 insertion(+) diff --git a/.release/ci.hcl b/.release/ci.hcl index c202d68f1..4ff2997b9 100644 --- a/.release/ci.hcl +++ b/.release/ci.hcl @@ -15,6 +15,7 @@ project "consul-template" { release_branches = [ "main", "release/**", + "crt-move-to-prepare-workflow", ] } } From 8607b924d9433e6867f01fb01f9e88038e09c38a Mon Sep 17 00:00:00 2001 From: Sarah Thompson Date: Fri, 6 Oct 2023 12:22:09 +0100 Subject: [PATCH 3/3] Update ci.hcl remove branch used for testing --- .release/ci.hcl | 1 - 1 file changed, 1 deletion(-) diff --git a/.release/ci.hcl b/.release/ci.hcl index 4ff2997b9..c202d68f1 100644 --- a/.release/ci.hcl +++ b/.release/ci.hcl @@ -15,7 +15,6 @@ project "consul-template" { release_branches = [ "main", "release/**", - "crt-move-to-prepare-workflow", ] } }