@@ -4,8 +4,7 @@ set -euo pipefail
4
4
5
5
DRA_WORKFLOW=${DRA_WORKFLOW:- snapshot}
6
6
7
- if [[ " $BUILDKITE_BRANCH " == * .x && " $DRA_WORKFLOW " == " staging" ]]; then
8
- exit 0
7
+ if [[ " $BUILDKITE_BRANCH " == * .x && " $DRA_WORKFLOW " == " staging" ]]; then exit 0
9
8
fi
10
9
11
10
echo --- Creating distribution
@@ -15,11 +14,11 @@ HADOOP_VERSION=$(grep eshadoop buildSrc/esh-version.properties | sed "s/eshadoop
15
14
BASE_VERSION=" $HADOOP_VERSION "
16
15
17
16
VERSION_SUFFIX=" "
18
- BUILD_ARGS= " -Dbuild.snapshot=false "
19
- QUALIFIER_BUILD_ARGS= " "
17
+ declare -a BUILD_ARGS
18
+ BUILD_ARGS[0]= " -Dbuild.snapshot=false "
20
19
if [[ " $DRA_WORKFLOW " == " snapshot" ]]; then
21
20
VERSION_SUFFIX=" -SNAPSHOT"
22
- BUILD_ARGS=" -Dbuild.snapshot=true"
21
+ BUILD_ARGS[0] =" -Dbuild.snapshot=true"
23
22
fi
24
23
25
24
RM_BRANCH=" $BUILDKITE_BRANCH "
@@ -28,15 +27,15 @@ if [[ "$BUILDKITE_BRANCH" == "main" ]]; then
28
27
fi
29
28
30
29
if [[ -n " ${VERSION_QUALIFIER:- } " ]]; then
31
- QUALIFIER_BUILD_ARGS= " -Dbuild.version_qualifier=$VERSION_QUALIFIER "
30
+ BUILD_ARGS+=( " -Dbuild.version_qualifier=$VERSION_QUALIFIER " )
32
31
HADOOP_VERSION=" ${HADOOP_VERSION} -${VERSION_QUALIFIER} "
33
32
fi
34
33
35
34
echo " DRA_WORKFLOW=$DRA_WORKFLOW "
36
35
echo " HADOOP_VERSION=$HADOOP_VERSION "
37
36
echo " RM_BRANCH=$RM_BRANCH "
38
37
echo " VERSION_SUFFIX=$VERSION_SUFFIX "
39
- echo " BUILD_ARGS=$BUILD_ARGS "
38
+ echo " BUILD_ARGS=${ BUILD_ARGS[@]} "
40
39
41
40
ES_BUILD_ID=$( curl -sS " https://artifacts-$DRA_WORKFLOW .elastic.co/elasticsearch/latest/${RM_BRANCH} .json" | jq -r ' .build_id' )
42
41
echo " ES_BUILD_ID=$ES_BUILD_ID "
@@ -45,7 +44,7 @@ mkdir localRepo
45
44
wget --quiet " https://artifacts-$DRA_WORKFLOW .elastic.co/elasticsearch/${ES_BUILD_ID} /maven/org/elasticsearch/gradle/build-tools/${HADOOP_VERSION}${VERSION_SUFFIX} /build-tools-${HADOOP_VERSION}${VERSION_SUFFIX} .jar" \
46
45
-O " localRepo/build-tools-${HADOOP_VERSION}${VERSION_SUFFIX} .jar"
47
46
48
- ./gradlew -S -PlocalRepo=true " ${BUILD_ARGS} " " ${QUALIFIER_BUILD_ARGS }" -Dorg.gradle.warning.mode=summary -Dcsv=" $WORKSPACE /build/distributions/dependencies-${HADOOP_VERSION}${VERSION_SUFFIX} .csv" :dist:generateDependenciesReport distribution
47
+ ./gradlew -S -PlocalRepo=true " ${BUILD_ARGS[@] } " -Dorg.gradle.warning.mode=summary -Dcsv=" $WORKSPACE /build/distributions/dependencies-${HADOOP_VERSION}${VERSION_SUFFIX} .csv" :dist:generateDependenciesReport distribution
49
48
50
49
# Allow other users access to read the artifacts so they are readable in the container
51
50
find " $WORKSPACE " -type f -path " */build/distributions/*" -exec chmod a+r {} \;
0 commit comments