@@ -29,6 +29,11 @@ if [[ "$WORKFLOW" == "snapshot" ]]; then
2929 VERSION_SUFFIX=" -SNAPSHOT"
3030fi
3131
32+ if [[ -n " $VERSION_QUALIFER " ]]; then
33+ ES_VERSION = " ${ES_VERSION} -${VERSION_QUALIFER} "
34+ echo " Version qualifier specified. ES_VERSION=${ES_VERSION} ."
35+ fi
36+
3237BEATS_BUILD_ID=" $( ./.ci/scripts/resolve-dra-manifest.sh beats " $RM_BRANCH " " $ES_VERSION " " $WORKFLOW " ) "
3338echo " BEATS_BUILD_ID=$BEATS_BUILD_ID "
3439
@@ -37,6 +42,7 @@ echo "ML_CPP_BUILD_ID=$ML_CPP_BUILD_ID"
3742
3843LICENSE_KEY_ARG=" "
3944BUILD_SNAPSHOT_ARG=" "
45+ VERSION_QUALIFIER_ARG=" "
4046
4147if [[ " $WORKFLOW " == " staging" ]]; then
4248 LICENSE_KEY=$( mktemp -d) /license.key
@@ -47,6 +53,10 @@ if [[ "$WORKFLOW" == "staging" ]]; then
4753 BUILD_SNAPSHOT_ARG=" -Dbuild.snapshot=false"
4854fi
4955
56+ if [[ -n " $VERSION_QUALIFER " ]]; then
57+ VERSION_QUALIFIER_ARG=" -Dbuild.version_qualifier=$VERSION_QUALIFER "
58+ fi
59+
5060echo --- Building release artifacts
5161
5262.ci/scripts/run-gradle.sh -Ddra.artifacts=true \
@@ -56,12 +66,17 @@ echo --- Building release artifacts
5666 -Dcsv=" $WORKSPACE /build/distributions/dependencies-${ES_VERSION}${VERSION_SUFFIX} .csv" \
5767 $LICENSE_KEY_ARG \
5868 $BUILD_SNAPSHOT_ARG \
69+ $VERSION_QUALIFIER_ARG \
5970 buildReleaseArtifacts \
6071 exportCompressedDockerImages \
6172 :distribution:generateDependenciesReport
6273
6374PATH=" $PATH :${JAVA_HOME} /bin" # Required by the following script
75+ if [[ -z " $VERSION_QUALIFER " ]]; then
6476x-pack/plugin/sql/connectors/tableau/package.sh asm qualifier=" $VERSION_SUFFIX "
77+ else
78+ x-pack/plugin/sql/connectors/tableau/package.sh asm qualifier=" $VERSION_QUALIFER "
79+ fi
6580
6681# we regenerate this file as part of the release manager invocation
6782rm " build/distributions/elasticsearch-jdbc-${ES_VERSION}${VERSION_SUFFIX} .taco.sha512"
@@ -88,6 +103,7 @@ docker run --rm \
88103 --branch " $RM_BRANCH " \
89104 --commit " $BUILDKITE_COMMIT " \
90105 --workflow " $WORKFLOW " \
106+ --qualifier " ${VERSION_QUALIFER:- } " \
91107 --version " $ES_VERSION " \
92108 --artifact-set main \
93109 --dependency " beats:https://artifacts-${WORKFLOW} .elastic.co/beats/${BEATS_BUILD_ID} /manifest-${ES_VERSION}${VERSION_SUFFIX} .json" \
0 commit comments