Skip to content

Commit d4c2bdf

Browse files
committed
Always use 7.17 for dra manifest script
1 parent 4f05e78 commit d4c2bdf

File tree

1 file changed

+11
-9
lines changed

1 file changed

+11
-9
lines changed

.ci/scripts/resolve-dra-manifest.sh

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,17 @@ ES_VERSION="${ES_VERSION:-$3}"
1616
WORKFLOW=${WORKFLOW:-$4}
1717

1818
LATEST_BUILD=$(fetch_build $WORKFLOW $ARTIFACT $BRANCH)
19-
LATEST_VERSION=$(strip_version $LATEST_BUILD)
2019

21-
# If the latest artifact version doesn't match what we expect, try the corresponding version branch.
22-
# This can happen when the version of artifact has been bumped on the master branch.
23-
if [ "$LATEST_VERSION" != "$ES_VERSION" ]; then
24-
echo "Latest build for '$ARTIFACT' is version $LATEST_VERSION but expected version $ES_VERSION." 1>&2
25-
NEW_BRANCH=$(echo $ES_VERSION | sed -E "s/([0-9]+\.[0-9]+)\.[0-9]/\1/g")
26-
echo "Using branch $NEW_BRANCH instead of $BRANCH." 1>&2
27-
LATEST_BUILD=$(fetch_build $WORKFLOW $ARTIFACT $NEW_BRANCH)
28-
fi
20+
# Commented out because there's only one 7.17 branch now
21+
# LATEST_VERSION=$(strip_version $LATEST_BUILD)
22+
23+
# # If the latest artifact version doesn't match what we expect, try the corresponding version branch.
24+
# # This can happen when the version of artifact has been bumped on the master branch.
25+
# if [ "$LATEST_VERSION" != "$ES_VERSION" ]; then
26+
# echo "Latest build for '$ARTIFACT' is version $LATEST_VERSION but expected version $ES_VERSION." 1>&2
27+
# NEW_BRANCH=$(echo $ES_VERSION | sed -E "s/([0-9]+\.[0-9]+)\.[0-9]/\1/g")
28+
# echo "Using branch $NEW_BRANCH instead of $BRANCH." 1>&2
29+
# LATEST_BUILD=$(fetch_build $WORKFLOW $ARTIFACT $NEW_BRANCH)
30+
# fi
2931

3032
echo $LATEST_BUILD

0 commit comments

Comments
 (0)