File tree 2 files changed +14
-3
lines changed
2 files changed +14
-3
lines changed Original file line number Diff line number Diff line change @@ -4,7 +4,7 @@ set -euo pipefail
4
4
5
5
DRA_WORKFLOW=${DRA_WORKFLOW:- snapshot}
6
6
7
- if [[ ( " $BUILDKITE_BRANCH " == " main " || " $BUILDKITE_BRANCH " == * .x) && " $DRA_WORKFLOW " == " staging" ]]; then
7
+ if [[ " $BUILDKITE_BRANCH " == * .x && " $DRA_WORKFLOW " == " staging" ]]; then
8
8
exit 0
9
9
fi
10
10
@@ -36,5 +36,6 @@ docker run --rm \
36
36
--branch " $RM_BRANCH " \
37
37
--commit " $GIT_COMMIT " \
38
38
--workflow " $DRA_WORKFLOW " \
39
+ --qualifier " ${VERSION_QUALIFIER:- } " \
39
40
--version " $DRV_VERSION " \
40
41
--artifact-set main
Original file line number Diff line number Diff line change @@ -16,8 +16,6 @@ for BRANCH in "${BRANCHES[@]}"; do
16
16
env:
17
17
DRA_WORKFLOW: snapshot
18
18
EOF
19
-
20
- # Don't trigger staging workflow for main branch
21
19
if [[ " $BRANCH " != " main" ]]; then
22
20
cat << EOF
23
21
- trigger: elasticsearch-sql-odbc-dra-workflow
27
25
branch: "$BRANCH "
28
26
env:
29
27
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
30
40
EOF
31
41
fi
32
42
done
You can’t perform that action at this time.
0 commit comments