Skip to content

Commit

Permalink
Use centralized version qualifier (#4393) (#4394)
Browse files Browse the repository at this point in the history
To avoid manual invocations specifying the version qualifier for
prereleases in this commit we leverage a centralized version of
truth for the version qualifier.

(cherry picked from commit 9c57ff4)

Co-authored-by: Dimitrios Liappis <dimitrios.liappis@gmail.com>
  • Loading branch information
mergify[bot] and dliappis authored Jan 31, 2025
1 parent fd41330 commit 4c395d0
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 3 deletions.
12 changes: 9 additions & 3 deletions .buildkite/pipeline.package.mbp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ steps:

- label: "Package x86_64 staging"
key: "package-x86-64-staging"
command: ".buildkite/scripts/package.sh staging"
command: |
source .buildkite/scripts/version_qualifier.sh
.buildkite/scripts/package.sh staging
agents:
provider: "gcp"
image: "${IMAGE_UBUNTU_X86_64}"
Expand All @@ -38,7 +40,9 @@ steps:

- label: "Package aarch64 staging"
key: "package-arm-staging"
command: ".buildkite/scripts/package.sh staging"
command: |
source .buildkite/scripts/version_qualifier.sh
.buildkite/scripts/package.sh staging
agents:
provider: "aws"
imagePrefix: "${IMAGE_UBUNTU_ARM_64}"
Expand All @@ -63,7 +67,9 @@ steps:
# details in https://github.com/elastic/ingest-dev/issues/4855
if: "${FILE_EXISTS_IN_REPO} == true && (build.env('BUILDKITE_BRANCH') != 'main' || build.env('VERSION_QUALIFIER') != null)"
key: "dra-staging"
command: ".buildkite/scripts/dra_release.sh staging"
command: |
source .buildkite/scripts/version_qualifier.sh
.buildkite/scripts/dra_release.sh staging
agents:
provider: "gcp"
image: "${IMAGE_UBUNTU_X86_64}"
Expand Down
22 changes: 22 additions & 0 deletions .buildkite/scripts/version_qualifier.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#!/usr/bin/env bash

# An opinionated approach to managing the Elastic Qualifier for the DRA in a Google Bucket
# instead of using a Buildkite env variable.

if [[ -n "$VERSION_QUALIFIER" ]]; then
echo "~~~ VERSION_QUALIFIER externally set to [$VERSION_QUALIFIER]"
return 0
fi

# DRA_BRANCH can be used for manually testing packaging with PRs
# e.g. define `DRA_BRANCH="main"` under Options/Environment Variables in the Buildkite UI after clicking new Build
BRANCH="${DRA_BRANCH:="${BUILDKITE_BRANCH:=""}"}"

qualifier=""
URL="https://storage.googleapis.com/dra-qualifier/${BRANCH}"
if curl -sf -o /dev/null "$URL" ; then
qualifier=$(curl -s "$URL")
fi

export VERSION_QUALIFIER="$qualifier"
echo "~~~ VERSION_QUALIFIER set to [$VERSION_QUALIFIER]"

0 comments on commit 4c395d0

Please sign in to comment.