Skip to content

Commit f968c9f

Browse files
mark-vieirarjernst
authored andcommitted
Preparation for 9.0.0-alpha1
1 parent cf52ed3 commit f968c9f

File tree

2 files changed

+18
-1
lines changed

2 files changed

+18
-1
lines changed

.buildkite/scripts/dra-workflow.sh

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@ if [[ "$WORKFLOW" == "snapshot" ]]; then
2929
VERSION_SUFFIX="-SNAPSHOT"
3030
fi
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+
3237
BEATS_BUILD_ID="$(./.ci/scripts/resolve-dra-manifest.sh beats "$RM_BRANCH" "$ES_VERSION" "$WORKFLOW")"
3338
echo "BEATS_BUILD_ID=$BEATS_BUILD_ID"
3439

@@ -37,6 +42,7 @@ echo "ML_CPP_BUILD_ID=$ML_CPP_BUILD_ID"
3742

3843
LICENSE_KEY_ARG=""
3944
BUILD_SNAPSHOT_ARG=""
45+
VERSION_QUALIFIER_ARG=""
4046

4147
if [[ "$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"
4854
fi
4955

56+
if [[ -n "$VERSION_QUALIFER" ]]; then
57+
VERSION_QUALIFIER_ARG="-Dbuild.version_qualifier=$VERSION_QUALIFER"
58+
fi
59+
5060
echo --- 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

6374
PATH="$PATH:${JAVA_HOME}/bin" # Required by the following script
75+
if [[ -z "$VERSION_QUALIFER" ]]; then
6476
x-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
6782
rm "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" \

.buildkite/scripts/dra-workflow.trigger.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ source .buildkite/scripts/branches.sh
88

99
for BRANCH in "${BRANCHES[@]}"; do
1010
if [[ "$BRANCH" == "main" ]]; then
11-
continue
11+
export VERSION_QUALIFIER="alpha1"
1212
fi
1313

1414
INTAKE_PIPELINE_SLUG="elasticsearch-intake"
@@ -24,5 +24,6 @@ for BRANCH in "${BRANCHES[@]}"; do
2424
commit: "$LAST_GOOD_COMMIT"
2525
env:
2626
DRA_WORKFLOW: staging
27+
VERSION_QUALIFIER: ${VERSION_QUALIFIER:-}
2728
EOF
2829
done

0 commit comments

Comments
 (0)