From 2b9c0d16fb0d960a4d65971bcc630c42a1bb4ef3 Mon Sep 17 00:00:00 2001 From: Pierre HILBERT Date: Fri, 20 Sep 2024 10:13:36 +0200 Subject: [PATCH 1/2] Chore: update packaging pipeline to run automatically on 8.x branch (#40915) (cherry picked from commit e8f41bbb0fc0e59e65a59e6b4b2086f5e72c48ab) # Conflicts: # .buildkite/packaging.pipeline.yml --- .buildkite/packaging.pipeline.yml | 34 ++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/.buildkite/packaging.pipeline.yml b/.buildkite/packaging.pipeline.yml index 4e1dbcdd4901..bea51b8b45fc 100644 --- a/.buildkite/packaging.pipeline.yml +++ b/.buildkite/packaging.pipeline.yml @@ -17,14 +17,18 @@ steps: # this prevents parallel builds and possibility of publishing out of order DRA artifacts if the first job takes longer than the second - name: Start of concurrency group for DRA Snapshot +<<<<<<< HEAD if: build.branch =~ /^\d+\.\d+$$/ || build.branch == 'main' || build.branch == '8.x' || build.env('RUN_SNAPSHOT') == "true" +======= + if: build.branch =~ /^[0-9]+\.[0-9x]+\$/ || build.branch == 'main' || build.env('RUN_SNAPSHOT') == "true" +>>>>>>> e8f41bbb0f (Chore: update packaging pipeline to run automatically on 8.x branch (#40915)) command: echo "--> Start of concurrency gate dra-snapshot" concurrency_group: "dra-gate-snapshot-$BUILDKITE_BRANCH" concurrency: 1 key: start-gate-snapshot - name: Start of concurrency group for DRA Staging - if: build.branch =~ /^\d+\.\d+$$/ + if: build.branch =~ /^[0-9]+\.[0-9x]+\$/ command: echo "--> Start of concurrency gate dra-staging" concurrency_group: "dra-gate-staging-$BUILDKITE_BRANCH" concurrency: 1 @@ -36,7 +40,11 @@ steps: key: dashboards steps: - label: Snapshot dashboards +<<<<<<< HEAD if: build.branch =~ /^\d+\.\d+$$/ || build.branch == 'main' || build.branch == '8.x' || build.env('RUN_SNAPSHOT') == "true" +======= + if: build.branch =~ /^[0-9]+\.[0-9x]+\$/ || build.branch == 'main' || build.env('RUN_SNAPSHOT') == "true" +>>>>>>> e8f41bbb0f (Chore: update packaging pipeline to run automatically on 8.x branch (#40915)) depends_on: start-gate-snapshot key: dashboards-snapshot # TODO: container with go and make @@ -58,7 +66,7 @@ steps: - build/distributions/**/* - label: Staging dashboards - if: build.branch =~ /^\d+\.\d+$$/ + if: build.branch =~ /^[0-9]+\.[0-9x]+\$/ depends_on: start-gate-staging key: dashboards-staging # TODO: container with go and make @@ -80,7 +88,11 @@ steps: - build/distributions/**/* - group: Packaging snapshot +<<<<<<< HEAD if: build.branch =~ /^\d+\.\d+$$/ || build.branch == 'main' || build.branch == '8.x' || build.env('RUN_SNAPSHOT') == "true" +======= + if: build.branch =~ /^[0-9]+\.[0-9x]+\$/ || build.branch == 'main' || build.env('RUN_SNAPSHOT') == "true" +>>>>>>> e8f41bbb0f (Chore: update packaging pipeline to run automatically on 8.x branch (#40915)) key: packaging-snapshot depends_on: start-gate-snapshot steps: @@ -169,7 +181,11 @@ steps: key: packaging-staging depends_on: start-gate-staging ## Only for release +<<<<<<< HEAD if: build.branch =~ /^\d+\.\d+$$/ || build.branch == '8.x' +======= + if: build.branch =~ /^[0-9]+\.[0-9x]+\$/ +>>>>>>> e8f41bbb0f (Chore: update packaging pipeline to run automatically on 8.x branch (#40915)) steps: - label: "STAGING: {{matrix}}" env: @@ -257,7 +273,11 @@ steps: steps: - label: DRA Snapshot ## Only for release branches and main +<<<<<<< HEAD if: build.branch =~ /^\d+\.\d+$$/ || build.branch == 'main' || build.branch == '8.x' || build.env('RUN_SNAPSHOT') == "true" +======= + if: build.branch =~ /^[0-9]+\.[0-9x]+\$/ || build.branch == 'main' || build.env('RUN_SNAPSHOT') == "true" +>>>>>>> e8f41bbb0f (Chore: update packaging pipeline to run automatically on 8.x branch (#40915)) key: dra-snapshot env: DRA_WORKFLOW: snapshot @@ -276,7 +296,7 @@ steps: - label: DRA Staging ## Only for release branches - if: build.branch =~ /^\d+\.\d+$$/ + if: build.branch =~ /^[0-9]+\.[0-9x]+\$/ key: dra-staging env: DRA_WORKFLOW: staging @@ -296,13 +316,21 @@ steps: - wait - command: echo "End of concurrency gate dra-snapshot <--" +<<<<<<< HEAD if: build.branch =~ /^\d+\.\d+$$/ || build.branch == 'main' || build.branch == '8.x' || build.env('RUN_SNAPSHOT') == "true" +======= + if: build.branch =~ /^[0-9]+\.[0-9x]+\$/ || build.branch == 'main' || build.env('RUN_SNAPSHOT') == "true" +>>>>>>> e8f41bbb0f (Chore: update packaging pipeline to run automatically on 8.x branch (#40915)) concurrency_group: "dra-gate-snapshot-$BUILDKITE_BRANCH" concurrency: 1 key: end-gate-snapshot - command: echo "End of concurrency gate dra-staging <--" +<<<<<<< HEAD if: build.branch =~ /^\d+\.\d+$$/ || build.branch == '8.x' +======= + if: build.branch =~ /^[0-9]+\.[0-9x]+\$/ +>>>>>>> e8f41bbb0f (Chore: update packaging pipeline to run automatically on 8.x branch (#40915)) concurrency_group: "dra-gate-staging-$BUILDKITE_BRANCH" concurrency: 1 key: end-gate-staging From bf9ea7db45a049145f165bd53faf8db84b3c6dca Mon Sep 17 00:00:00 2001 From: Pierre HILBERT Date: Fri, 20 Sep 2024 10:55:25 +0200 Subject: [PATCH 2/2] Update packaging.pipeline.yml --- .buildkite/packaging.pipeline.yml | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/.buildkite/packaging.pipeline.yml b/.buildkite/packaging.pipeline.yml index bea51b8b45fc..67cdfa363268 100644 --- a/.buildkite/packaging.pipeline.yml +++ b/.buildkite/packaging.pipeline.yml @@ -17,11 +17,7 @@ steps: # this prevents parallel builds and possibility of publishing out of order DRA artifacts if the first job takes longer than the second - name: Start of concurrency group for DRA Snapshot -<<<<<<< HEAD - if: build.branch =~ /^\d+\.\d+$$/ || build.branch == 'main' || build.branch == '8.x' || build.env('RUN_SNAPSHOT') == "true" -======= if: build.branch =~ /^[0-9]+\.[0-9x]+\$/ || build.branch == 'main' || build.env('RUN_SNAPSHOT') == "true" ->>>>>>> e8f41bbb0f (Chore: update packaging pipeline to run automatically on 8.x branch (#40915)) command: echo "--> Start of concurrency gate dra-snapshot" concurrency_group: "dra-gate-snapshot-$BUILDKITE_BRANCH" concurrency: 1 @@ -40,11 +36,7 @@ steps: key: dashboards steps: - label: Snapshot dashboards -<<<<<<< HEAD - if: build.branch =~ /^\d+\.\d+$$/ || build.branch == 'main' || build.branch == '8.x' || build.env('RUN_SNAPSHOT') == "true" -======= if: build.branch =~ /^[0-9]+\.[0-9x]+\$/ || build.branch == 'main' || build.env('RUN_SNAPSHOT') == "true" ->>>>>>> e8f41bbb0f (Chore: update packaging pipeline to run automatically on 8.x branch (#40915)) depends_on: start-gate-snapshot key: dashboards-snapshot # TODO: container with go and make @@ -88,11 +80,7 @@ steps: - build/distributions/**/* - group: Packaging snapshot -<<<<<<< HEAD - if: build.branch =~ /^\d+\.\d+$$/ || build.branch == 'main' || build.branch == '8.x' || build.env('RUN_SNAPSHOT') == "true" -======= if: build.branch =~ /^[0-9]+\.[0-9x]+\$/ || build.branch == 'main' || build.env('RUN_SNAPSHOT') == "true" ->>>>>>> e8f41bbb0f (Chore: update packaging pipeline to run automatically on 8.x branch (#40915)) key: packaging-snapshot depends_on: start-gate-snapshot steps: @@ -181,11 +169,7 @@ steps: key: packaging-staging depends_on: start-gate-staging ## Only for release -<<<<<<< HEAD - if: build.branch =~ /^\d+\.\d+$$/ || build.branch == '8.x' -======= if: build.branch =~ /^[0-9]+\.[0-9x]+\$/ ->>>>>>> e8f41bbb0f (Chore: update packaging pipeline to run automatically on 8.x branch (#40915)) steps: - label: "STAGING: {{matrix}}" env: @@ -273,11 +257,7 @@ steps: steps: - label: DRA Snapshot ## Only for release branches and main -<<<<<<< HEAD - if: build.branch =~ /^\d+\.\d+$$/ || build.branch == 'main' || build.branch == '8.x' || build.env('RUN_SNAPSHOT') == "true" -======= if: build.branch =~ /^[0-9]+\.[0-9x]+\$/ || build.branch == 'main' || build.env('RUN_SNAPSHOT') == "true" ->>>>>>> e8f41bbb0f (Chore: update packaging pipeline to run automatically on 8.x branch (#40915)) key: dra-snapshot env: DRA_WORKFLOW: snapshot @@ -316,21 +296,13 @@ steps: - wait - command: echo "End of concurrency gate dra-snapshot <--" -<<<<<<< HEAD - if: build.branch =~ /^\d+\.\d+$$/ || build.branch == 'main' || build.branch == '8.x' || build.env('RUN_SNAPSHOT') == "true" -======= if: build.branch =~ /^[0-9]+\.[0-9x]+\$/ || build.branch == 'main' || build.env('RUN_SNAPSHOT') == "true" ->>>>>>> e8f41bbb0f (Chore: update packaging pipeline to run automatically on 8.x branch (#40915)) concurrency_group: "dra-gate-snapshot-$BUILDKITE_BRANCH" concurrency: 1 key: end-gate-snapshot - command: echo "End of concurrency gate dra-staging <--" -<<<<<<< HEAD - if: build.branch =~ /^\d+\.\d+$$/ || build.branch == '8.x' -======= if: build.branch =~ /^[0-9]+\.[0-9x]+\$/ ->>>>>>> e8f41bbb0f (Chore: update packaging pipeline to run automatically on 8.x branch (#40915)) concurrency_group: "dra-gate-staging-$BUILDKITE_BRANCH" concurrency: 1 key: end-gate-staging