ci(dra): version should not include the qualifier (#15278)

elastic · Jan 17, 2025 · 9e6c6c6 · 9e6c6c6
1 parent 40c5556
commit 9e6c6c6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/.buildkite/scripts/dra.sh b/.buildkite/scripts/dra.sh
@@ -13,8 +13,8 @@ set -eo pipefail
 # Either staging or snapshot
 TYPE="$1"
 
-## Read current version.
-VERSION=$(make get-version)
+## Read current version without the qualifier
+VERSION=$(make get-version-only)
 
 echo "--- Restoring Artifacts"
 buildkite-agent artifact download "build/**/*" .

diff --git a/Makefile b/Makefile
@@ -143,6 +143,11 @@ endif
 get-version:
 	@echo $(APM_SERVER_VERSION)
 
+## get-version-only : Get the apm server version without the qualifier
+.PHONY: get-version-only
+get-version-only:
+	@echo $(APM_SERVER_ONLY_VERSION)
+
 # update-go-version updates .go-version, documentation, and build files
 # to use the most recent patch version for the major.minor Go version
 # defined in go.mod.