File tree Expand file tree Collapse file tree 2 files changed +14
-3
lines changed Expand file tree Collapse file tree 2 files changed +14
-3
lines changed Original file line number Diff line number Diff line change @@ -4,7 +4,7 @@ set -euo pipefail
44
55DRA_WORKFLOW=${DRA_WORKFLOW:- snapshot}
66
7- if [[ ( " $BUILDKITE_BRANCH " == " main " || " $BUILDKITE_BRANCH " == * .x) && " $DRA_WORKFLOW " == " staging" ]]; then
7+ if [[ " $BUILDKITE_BRANCH " == * .x && " $DRA_WORKFLOW " == " staging" ]]; then
88 exit 0
99fi
1010
@@ -36,5 +36,6 @@ docker run --rm \
3636 --branch " $RM_BRANCH " \
3737 --commit " $GIT_COMMIT " \
3838 --workflow " $DRA_WORKFLOW " \
39+ --qualifier " ${VERSION_QUALIFIER:- } " \
3940 --version " $DRV_VERSION " \
4041 --artifact-set main
Original file line number Diff line number Diff line change @@ -16,8 +16,6 @@ for BRANCH in "${BRANCHES[@]}"; do
1616 env:
1717 DRA_WORKFLOW: snapshot
1818EOF
19-
20- # Don't trigger staging workflow for main branch
2119 if [[ " $BRANCH " != " main" ]]; then
2220 cat << EOF
2321 - trigger: elasticsearch-sql-odbc-dra-workflow
2725 branch: "$BRANCH "
2826 env:
2927 DRA_WORKFLOW: staging
28+ EOF
29+ else
30+ # Pass version qualifier to main builds
31+ cat << EOF
32+ - trigger: elasticsearch-sql-odbc-dra-workflow
33+ label: Trigger DRA staging workflow for $BRANCH
34+ async: true
35+ build:
36+ branch: "$BRANCH "
37+ env:
38+ DRA_WORKFLOW: staging
39+ VERSION_QUALIFIER: alpha1
3040EOF
3141 fi
3242done
You can’t perform that action at this time.
0 commit comments