Handle conditional build args better

Author: mark-vieira

.buildkite/dra.sh

@@ -15,11 +15,11 @@ HADOOP_VERSION=$(grep eshadoop buildSrc/esh-version.properties | sed "s/eshadoop
 BASE_VERSION="$HADOOP_VERSION"
 
 VERSION_SUFFIX=""
-BUILD_ARGS="-Dbuild.snapshot=false"
-QUALIFIER_BUILD_ARGS="-Dbuild.version_qualifier=\"\""
+declare -a BUILD_ARGS
+BUILD_ARGS[0]="-Dbuild.snapshot=false"
 if [[ "$DRA_WORKFLOW" == "snapshot" ]]; then
   VERSION_SUFFIX="-SNAPSHOT"
-  BUILD_ARGS="-Dbuild.snapshot=true"
+  BUILD_ARGS[0]="-Dbuild.snapshot=true"
 fi
 
 RM_BRANCH="$BUILDKITE_BRANCH"
@@ -28,15 +28,15 @@ if [[ "$BUILDKITE_BRANCH" == "main" ]]; then
 fi
 
 if [[ -n "${VERSION_QUALIFIER:-}" ]]; then
-  QUALIFIER_BUILD_ARGS="-Dbuild.version_qualifier=$VERSION_QUALIFIER"
+  BUILD_ARGS+=("-Dbuild.version_qualifier=$VERSION_QUALIFIER")
   HADOOP_VERSION="${HADOOP_VERSION}-${VERSION_QUALIFIER}"
 fi
 
 echo "DRA_WORKFLOW=$DRA_WORKFLOW"
 echo "HADOOP_VERSION=$HADOOP_VERSION"
 echo "RM_BRANCH=$RM_BRANCH"
 echo "VERSION_SUFFIX=$VERSION_SUFFIX"
-echo "BUILD_ARGS=$BUILD_ARGS"
+echo "BUILD_ARGS=${BUILD_ARGS[@]}"
 
 ES_BUILD_ID=$(curl -sS "https://artifacts-$DRA_WORKFLOW.elastic.co/elasticsearch/latest/${RM_BRANCH}.json" | jq -r '.build_id')
 echo "ES_BUILD_ID=$ES_BUILD_ID"
@@ -45,7 +45,7 @@ mkdir localRepo
 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" \
   -O "localRepo/build-tools-${HADOOP_VERSION}${VERSION_SUFFIX}.jar"
 
-./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
+./gradlew -S -PlocalRepo=true "${BUILD_ARGS[@]}" -Dorg.gradle.warning.mode=summary -Dcsv="$WORKSPACE/build/distributions/dependencies-${HADOOP_VERSION}${VERSION_SUFFIX}.csv" :dist:generateDependenciesReport distribution
 
 # Allow other users access to read the artifacts so they are readable in the container
 find "$WORKSPACE" -type f -path "*/build/distributions/*" -exec chmod a+r {} \;