From 6dd74bb51c2e5dd2c25d415e5b8a0db6bc109c9f Mon Sep 17 00:00:00 2001 From: Raymond Jacobson Date: Tue, 20 Feb 2024 15:56:46 -0800 Subject: [PATCH 01/12] Allow workflows to be manually triggered --- .circleci/config.yml | 61 ++++++++++++++++++++++++++++++++------------ 1 file changed, 45 insertions(+), 16 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 27b5b613f6c..653a24871ff 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -583,44 +583,73 @@ workflows: release-create-branch: when: - and: - - equal: [scheduled_pipeline, << pipeline.trigger_source >>] - - equal: ['release-create-branch', << pipeline.schedule.name >>] + condition: + or: + - and: + - equal: [scheduled_pipeline, << pipeline.trigger_source >>] + - equal: ['release-create-branch', << pipeline.schedule.name >>] + - equal: ['release-create-branch', << pipeline.parameters.workflow >>] jobs: - generate-release-branch auto-approve-foundation-deploy: when: - and: - - equal: [scheduled_pipeline, << pipeline.trigger_source >>] - - equal: - ['auto-approve-foundation-deploy', << pipeline.schedule.name >>] + condition: + or: + - and: + - equal: [scheduled_pipeline, << pipeline.trigger_source >>] + - equal: + [ + 'auto-approve-foundation-deploy', + << pipeline.schedule.name >> + ] + - equal: + [ + 'auto-approve-foundation-deploy', + << pipeline.parameters.workflow >> + ] jobs: - approve-deployment-holds: context: [slack-secrets, circle-daily-deploy-secrets] notify-sp-release: when: - and: - - equal: [scheduled_pipeline, << pipeline.trigger_source >>] - - equal: ['notify-sp-release', << pipeline.schedule.name >>] + condition: + or: + - and: + - equal: [scheduled_pipeline, << pipeline.trigger_source >>] + - equal: ['notify-sp-release', << pipeline.schedule.name >>] + - equal: ['notify-sp-release', << pipeline.parameters.workflow >>] jobs: - notify-sp-release-job: context: [slack-secrets, circle-daily-deploy-secrets] release-client-create-branch: when: - and: - - equal: [scheduled_pipeline, << pipeline.trigger_source >>] - - equal: ['release-client-create-branch', << pipeline.schedule.name >>] + condition: + or: + - and: + - equal: [scheduled_pipeline, << pipeline.trigger_source >>] + - equal: + ['release-client-create-branch', << pipeline.schedule.name >>] + - equal: + [ + 'release-client-create-branch', + << pipeline.parameters.workflow >> + ] jobs: - generate-client-release notify-stuck-stage-nodes: when: - and: - - equal: [scheduled_pipeline, << pipeline.trigger_source >>] - - equal: ['notify-stuck-stage-nodes', << pipeline.schedule.name >>] + condition: + or: + - and: + - equal: [scheduled_pipeline, << pipeline.trigger_source >>] + - equal: + ['notify-stuck-stage-nodes', << pipeline.schedule.name >>] + - equal: + ['notify-stuck-stage-nodes', << pipeline.parameters.workflow >>] jobs: - notify-stuck-stage-nodes-job: context: [slack-secrets] From a2510c36a900e5b3712ea6744825de89dfab8cc6 Mon Sep 17 00:00:00 2001 From: Raymond Jacobson Date: Tue, 20 Feb 2024 16:16:42 -0800 Subject: [PATCH 02/12] Fix set up workflow --- .circleci/config.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 653a24871ff..7bb5ff3eaf3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -424,8 +424,11 @@ jobs: workflows: setup: when: - not: - equal: [scheduled_pipeline, << pipeline.trigger_source >>] + and: + - not: + equal: [scheduled_pipeline, << pipeline.trigger_source >>] + - not: + equal: ['', << pipeline.parameters.workflow >>] jobs: - generate-config - init: From c2bf68b05ee243e5991290b5c353a43808ad2a84 Mon Sep 17 00:00:00 2001 From: Raymond Jacobson Date: Tue, 20 Feb 2024 16:22:42 -0800 Subject: [PATCH 03/12] Try fixing not --- .circleci/config.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7bb5ff3eaf3..255b629e049 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -427,8 +427,7 @@ workflows: and: - not: equal: [scheduled_pipeline, << pipeline.trigger_source >>] - - not: - equal: ['', << pipeline.parameters.workflow >>] + - not: << pipeline.parameters.workflow >> jobs: - generate-config - init: From ea2d2ec75d236fe838bbce0e0bd8ac9063e7b924 Mon Sep 17 00:00:00 2001 From: Raymond Jacobson Date: Tue, 20 Feb 2024 16:24:49 -0800 Subject: [PATCH 04/12] Check against main --- .circleci/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 255b629e049..26d31f673a7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -427,7 +427,8 @@ workflows: and: - not: equal: [scheduled_pipeline, << pipeline.trigger_source >>] - - not: << pipeline.parameters.workflow >> + - not: + equal: ['main', << pipeline.parameters.workflow >>] jobs: - generate-config - init: From c21cdb0a82aefb0e0f04b191ca1bbb3d9817f3ef Mon Sep 17 00:00:00 2001 From: Raymond Jacobson Date: Tue, 20 Feb 2024 16:36:11 -0800 Subject: [PATCH 05/12] Invert check --- .circleci/config.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 26d31f673a7..b4b63e56c93 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -427,8 +427,7 @@ workflows: and: - not: equal: [scheduled_pipeline, << pipeline.trigger_source >>] - - not: - equal: ['main', << pipeline.parameters.workflow >>] + - equal: ['main', << pipeline.parameters.workflow >>] jobs: - generate-config - init: From 925296c75018364b79e2e75b3447f897c741f64e Mon Sep 17 00:00:00 2001 From: Raymond Jacobson Date: Tue, 20 Feb 2024 16:46:54 -0800 Subject: [PATCH 06/12] Reorder --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b4b63e56c93..dd831414f87 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -425,9 +425,9 @@ workflows: setup: when: and: + - equal: ['main', << pipeline.parameters.workflow >>] - not: equal: [scheduled_pipeline, << pipeline.trigger_source >>] - - equal: ['main', << pipeline.parameters.workflow >>] jobs: - generate-config - init: From 516272ffa7c8a015a88bce7221a82665081c2a81 Mon Sep 17 00:00:00 2001 From: Raymond Jacobson Date: Tue, 20 Feb 2024 16:49:11 -0800 Subject: [PATCH 07/12] Remove scheduled checks --- .circleci/config.yml | 72 ++------------------------------------------ 1 file changed, 2 insertions(+), 70 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index dd831414f87..a8e016f3225 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -426,8 +426,6 @@ workflows: when: and: - equal: ['main', << pipeline.parameters.workflow >>] - - not: - equal: [scheduled_pipeline, << pipeline.trigger_source >>] jobs: - generate-config - init: @@ -583,75 +581,9 @@ workflows: - init workspace_path: ../workspace - release-create-branch: - when: - condition: - or: - - and: - - equal: [scheduled_pipeline, << pipeline.trigger_source >>] - - equal: ['release-create-branch', << pipeline.schedule.name >>] - - equal: ['release-create-branch', << pipeline.parameters.workflow >>] - jobs: - - generate-release-branch - - auto-approve-foundation-deploy: - when: - condition: - or: - - and: - - equal: [scheduled_pipeline, << pipeline.trigger_source >>] - - equal: - [ - 'auto-approve-foundation-deploy', - << pipeline.schedule.name >> - ] - - equal: - [ - 'auto-approve-foundation-deploy', - << pipeline.parameters.workflow >> - ] - jobs: - - approve-deployment-holds: - context: [slack-secrets, circle-daily-deploy-secrets] - - notify-sp-release: - when: - condition: - or: - - and: - - equal: [scheduled_pipeline, << pipeline.trigger_source >>] - - equal: ['notify-sp-release', << pipeline.schedule.name >>] - - equal: ['notify-sp-release', << pipeline.parameters.workflow >>] - jobs: - - notify-sp-release-job: - context: [slack-secrets, circle-daily-deploy-secrets] - release-client-create-branch: when: - condition: - or: - - and: - - equal: [scheduled_pipeline, << pipeline.trigger_source >>] - - equal: - ['release-client-create-branch', << pipeline.schedule.name >>] - - equal: - [ - 'release-client-create-branch', - << pipeline.parameters.workflow >> - ] + equal: + ['release-client-create-branch', << pipeline.parameters.workflow >>] jobs: - generate-client-release - - notify-stuck-stage-nodes: - when: - condition: - or: - - and: - - equal: [scheduled_pipeline, << pipeline.trigger_source >>] - - equal: - ['notify-stuck-stage-nodes', << pipeline.schedule.name >>] - - equal: - ['notify-stuck-stage-nodes', << pipeline.parameters.workflow >>] - jobs: - - notify-stuck-stage-nodes-job: - context: [slack-secrets] From ae66fe4d14181d21b10311bc2f796212e9aa9459 Mon Sep 17 00:00:00 2001 From: Raymond Jacobson Date: Tue, 20 Feb 2024 16:49:50 -0800 Subject: [PATCH 08/12] Add back one check --- .circleci/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index a8e016f3225..65ba1903b98 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -426,6 +426,8 @@ workflows: when: and: - equal: ['main', << pipeline.parameters.workflow >>] + - not: + equal: [scheduled_pipeline, << pipeline.trigger_source >>] jobs: - generate-config - init: From ca523978def049d2a5730941d2cd5fa90d393690 Mon Sep 17 00:00:00 2001 From: Raymond Jacobson Date: Tue, 20 Feb 2024 16:50:24 -0800 Subject: [PATCH 09/12] Add back another --- .circleci/config.yml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 65ba1903b98..e5d758d81e6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -585,7 +585,16 @@ workflows: release-client-create-branch: when: - equal: - ['release-client-create-branch', << pipeline.parameters.workflow >>] + condition: + or: + - and: + - equal: [scheduled_pipeline, << pipeline.trigger_source >>] + - equal: + ['release-client-create-branch', << pipeline.schedule.name >>] + - equal: + [ + 'release-client-create-branch', + << pipeline.parameters.workflow >> + ] jobs: - generate-client-release From 361aca8263ad91dc5f695ade4a12625bca3334d4 Mon Sep 17 00:00:00 2001 From: Raymond Jacobson Date: Tue, 20 Feb 2024 16:52:21 -0800 Subject: [PATCH 10/12] Fix conditional --- .circleci/config.yml | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e5d758d81e6..49808670072 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -585,16 +585,12 @@ workflows: release-client-create-branch: when: - condition: - or: - - and: - - equal: [scheduled_pipeline, << pipeline.trigger_source >>] - - equal: - ['release-client-create-branch', << pipeline.schedule.name >>] - - equal: - [ - 'release-client-create-branch', - << pipeline.parameters.workflow >> - ] + or: + - and: + - equal: [scheduled_pipeline, << pipeline.trigger_source >>] + - equal: + ['release-client-create-branch', << pipeline.schedule.name >>] + - equal: + ['release-client-create-branch', << pipeline.parameters.workflow >>] jobs: - generate-client-release From 0bee0c71969a073692da68539f76865cb8b0b764 Mon Sep 17 00:00:00 2001 From: Raymond Jacobson Date: Tue, 20 Feb 2024 16:53:46 -0800 Subject: [PATCH 11/12] Clean up and remove trigger checks --- .circleci/config.yml | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 49808670072..5d85058479f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -424,10 +424,7 @@ jobs: workflows: setup: when: - and: - - equal: ['main', << pipeline.parameters.workflow >>] - - not: - equal: [scheduled_pipeline, << pipeline.trigger_source >>] + equal: ['main', << pipeline.parameters.workflow >>] jobs: - generate-config - init: @@ -583,14 +580,30 @@ workflows: - init workspace_path: ../workspace + release-create-branch: + when: + equal: ['release-create-branch', << pipeline.parameters.workflow >>] + jobs: + - generate-release-branch + + auto-approve-foundation-deploy: + when: + equal: + ['auto-approve-foundation-deploy', << pipeline.parameters.workflow >>] + jobs: + - approve-deployment-holds: + context: [slack-secrets, circle-daily-deploy-secrets] + + notify-sp-release: + when: + equal: ['notify-sp-release', << pipeline.parameters.workflow >>] + jobs: + - notify-sp-release-job: + context: [slack-secrets, circle-daily-deploy-secrets] + release-client-create-branch: when: - or: - - and: - - equal: [scheduled_pipeline, << pipeline.trigger_source >>] - - equal: - ['release-client-create-branch', << pipeline.schedule.name >>] - - equal: - ['release-client-create-branch', << pipeline.parameters.workflow >>] + equal: + ['release-client-create-branch', << pipeline.parameters.workflow >>] jobs: - generate-client-release From ca36263237a624797bc7479b9bdb5e1db57b5361 Mon Sep 17 00:00:00 2001 From: Raymond Jacobson Date: Tue, 20 Feb 2024 17:03:26 -0800 Subject: [PATCH 12/12] Put back stuck stage nodes --- .circleci/config.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5d85058479f..51a29fe8950 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -607,3 +607,12 @@ workflows: ['release-client-create-branch', << pipeline.parameters.workflow >>] jobs: - generate-client-release + + notify-stuck-stage-nodes: + when: + and: + - equal: + ['notify-stuck-stage-nodes', << pipeline.parameters.workflow >>] + jobs: + - notify-stuck-stage-nodes-job: + context: [slack-secrets]