File tree Expand file tree Collapse file tree 2 files changed +25
-2
lines changed Expand file tree Collapse file tree 2 files changed +25
-2
lines changed Original file line number Diff line number Diff line change @@ -15,12 +15,28 @@ for BRANCH in "${BRANCHES[@]}"; do
15
15
branch: "$BRANCH "
16
16
env:
17
17
DRA_WORKFLOW: snapshot
18
+ EOF
19
+ if [[ " $BRANCH " != " main" ]]; then
20
+ cat << EOF
21
+ - trigger: elasticsearch-hadoop-dra-workflow
22
+ label: Trigger DRA staging workflow for $BRANCH
23
+ async: true
24
+ build:
25
+ branch: "$BRANCH "
26
+ env:
27
+ DRA_WORKFLOW: staging
28
+ EOF
29
+ else
30
+ # Pass version qualifier to main builds
31
+ cat << EOF
18
32
- trigger: elasticsearch-hadoop-dra-workflow
19
33
label: Trigger DRA staging workflow for $BRANCH
20
34
async: true
21
35
build:
22
36
branch: "$BRANCH "
23
37
env:
24
38
DRA_WORKFLOW: staging
39
+ VERSION_QUALIFIER: alpha1
25
40
EOF
41
+ fi
26
42
done
Original file line number Diff line number Diff line change @@ -4,14 +4,15 @@ 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
11
11
echo --- Creating distribution
12
12
13
13
rm -Rfv ~ /.gradle/init.d
14
14
HADOOP_VERSION=$( grep eshadoop buildSrc/esh-version.properties | sed " s/eshadoop *= *//g" )
15
+ BASE_VERSION=" $HADOOP_VERSION "
15
16
16
17
VERSION_SUFFIX=" "
17
18
BUILD_ARGS=" -Dbuild.snapshot=false"
@@ -25,6 +26,11 @@ if [[ "$BUILDKITE_BRANCH" == "main" ]]; then
25
26
RM_BRANCH=master
26
27
fi
27
28
29
+ if [[ -n " ${VERSION_QUALIFIER:- } " ]]; then
30
+ BUILD_ARGS=" $BUILD_ARGS -Dbuild.version_qualifier=$VERSION_QUALIFIER "
31
+ HADOOP_VERSION=" ${HADOOP_VERSION} -${VERSION_QUALIFIER} "
32
+ fi
33
+
28
34
echo " DRA_WORKFLOW=$DRA_WORKFLOW "
29
35
echo " HADOOP_VERSION=$HADOOP_VERSION "
30
36
echo " RM_BRANCH=$RM_BRANCH "
@@ -60,5 +66,6 @@ docker run --rm \
60
66
--branch " $RM_BRANCH " \
61
67
--commit " $BUILDKITE_COMMIT " \
62
68
--workflow " $DRA_WORKFLOW " \
63
- --version " $HADOOP_VERSION " \
69
+ --qualifier " ${VERSION_QUALIFIER:- } " \
70
+ --version " $BASE_VERSION " \
64
71
--artifact-set main
You can’t perform that action at this time.
0 commit comments