Skip to content

Commit

Permalink
Don't run packaging snapshot with prereleases (#42326) (#42333)
Browse files Browse the repository at this point in the history
This fixes a small bug related to #42304 ; when we (manually)
trigger prerelease builds (by setting VERSION_QUALIFIER="...") we
only want them to trigger staging builds and skip snapshot builds.

(cherry picked from commit a122a9f)

Co-authored-by: Dimitrios Liappis <[email protected]>
  • Loading branch information
mergify[bot] and dliappis authored Jan 17, 2025
1 parent 6bccca1 commit 27de6d3
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions .buildkite/packaging.pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +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
if: build.branch =~ /^[0-9]+\.[0-9x]+\$/ || build.branch == 'main' || build.env('RUN_SNAPSHOT') == "true"
if: (build.branch =~ /^[0-9]+\.[0-9x]+\$/ || build.branch == 'main' || build.env('RUN_SNAPSHOT') == "true") && build.env('VERSION_QUALIFIER') == null
command: echo "--> Start of concurrency gate dra-snapshot"
concurrency_group: "dra-gate-snapshot-$BUILDKITE_BRANCH"
concurrency: 1
Expand All @@ -38,7 +38,7 @@ steps:
key: dashboards
steps:
- label: Snapshot dashboards
if: build.branch =~ /^[0-9]+\.[0-9x]+\$/ || build.branch == 'main' || build.env('RUN_SNAPSHOT') == "true"
if: (build.branch =~ /^[0-9]+\.[0-9x]+\$/ || build.branch == 'main' || build.env('RUN_SNAPSHOT') == "true") && build.env('VERSION_QUALIFIER') == null
depends_on: start-gate-snapshot
key: dashboards-snapshot
# TODO: container with go and make
Expand Down Expand Up @@ -83,7 +83,7 @@ steps:
- build/distributions/**/*

- group: Packaging snapshot
if: build.branch =~ /^[0-9]+\.[0-9x]+\$/ || build.branch == 'main' || build.env('RUN_SNAPSHOT') == "true"
if: (build.branch =~ /^[0-9]+\.[0-9x]+\$/ || build.branch == 'main' || build.env('RUN_SNAPSHOT') == "true") && build.env('VERSION_QUALIFIER') == null
key: packaging-snapshot
depends_on: start-gate-snapshot
steps:
Expand Down Expand Up @@ -263,7 +263,7 @@ steps:
steps:
- label: DRA Snapshot
## Only for release branches and main
if: build.branch =~ /^[0-9]+\.[0-9x]+\$/ || build.branch == 'main' || build.env('RUN_SNAPSHOT') == "true"
if: (build.branch =~ /^[0-9]+\.[0-9x]+\$/ || build.branch == 'main' || build.env('RUN_SNAPSHOT') == "true") && build.env('VERSION_QUALIFIER') == null
key: dra-snapshot
env:
DRA_WORKFLOW: snapshot
Expand Down Expand Up @@ -302,13 +302,13 @@ steps:
- wait

- command: echo "End of concurrency gate dra-snapshot <--"
if: build.branch =~ /^[0-9]+\.[0-9x]+\$/ || build.branch == 'main' || build.env('RUN_SNAPSHOT') == "true"
if: (build.branch =~ /^[0-9]+\.[0-9x]+\$/ || build.branch == 'main' || build.env('RUN_SNAPSHOT') == "true") && build.env('VERSION_QUALIFIER') == null
concurrency_group: "dra-gate-snapshot-$BUILDKITE_BRANCH"
concurrency: 1
key: end-gate-snapshot

- command: echo "End of concurrency gate dra-staging <--"
if: build.branch =~ /^[0-9]+\.[0-9x]+\$/
if: build.branch =~ /^[0-9]+\.[0-9x]+\$/ || build.env('VERSION_QUALIFIER') != null
concurrency_group: "dra-gate-staging-$BUILDKITE_BRANCH"
concurrency: 1
key: end-gate-staging

0 comments on commit 27de6d3

Please sign in to comment.