Skip to content

Commit 56761ae

Browse files
committed
Prepare for 9.0.0-alpha1
1 parent ac7b8dc commit 56761ae

File tree

2 files changed

+25
-2
lines changed

2 files changed

+25
-2
lines changed

.buildkite/dra-workflow.trigger.sh

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,28 @@ for BRANCH in "${BRANCHES[@]}"; do
1515
branch: "$BRANCH"
1616
env:
1717
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
1832
- trigger: elasticsearch-hadoop-dra-workflow
1933
label: Trigger DRA staging workflow for $BRANCH
2034
async: true
2135
build:
2236
branch: "$BRANCH"
2337
env:
2438
DRA_WORKFLOW: staging
39+
VERSION_QUALIFIER: alpha1
2540
EOF
41+
fi
2642
done

.buildkite/dra.sh

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,15 @@ set -euo pipefail
44

55
DRA_WORKFLOW=${DRA_WORKFLOW:-snapshot}
66

7-
if [[ ("$BUILDKITE_BRANCH" == "main" || "$BUILDKITE_BRANCH" == *.x) && "$DRA_WORKFLOW" == "staging" ]]; then
7+
if [[ "$BUILDKITE_BRANCH" == *.x && "$DRA_WORKFLOW" == "staging" ]]; then
88
exit 0
99
fi
1010

1111
echo --- Creating distribution
1212

1313
rm -Rfv ~/.gradle/init.d
1414
HADOOP_VERSION=$(grep eshadoop buildSrc/esh-version.properties | sed "s/eshadoop *= *//g")
15+
BASE_VERSION="$HADOOP_VERSION"
1516

1617
VERSION_SUFFIX=""
1718
BUILD_ARGS="-Dbuild.snapshot=false"
@@ -25,6 +26,11 @@ if [[ "$BUILDKITE_BRANCH" == "main" ]]; then
2526
RM_BRANCH=master
2627
fi
2728

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+
2834
echo "DRA_WORKFLOW=$DRA_WORKFLOW"
2935
echo "HADOOP_VERSION=$HADOOP_VERSION"
3036
echo "RM_BRANCH=$RM_BRANCH"
@@ -60,5 +66,6 @@ docker run --rm \
6066
--branch "$RM_BRANCH" \
6167
--commit "$BUILDKITE_COMMIT" \
6268
--workflow "$DRA_WORKFLOW" \
63-
--version "$HADOOP_VERSION" \
69+
--qualifier "${VERSION_QUALIFIER:-}" \
70+
--version "$BASE_VERSION" \
6471
--artifact-set main

0 commit comments

Comments
 (0)