Skip to content

Commit

Permalink
Fix version
Browse files Browse the repository at this point in the history
  • Loading branch information
marc-gr committed Jul 14, 2023
1 parent fe0ea3a commit d032d9d
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 9 deletions.
7 changes: 3 additions & 4 deletions .buildkite/pipeline.elastic-agent-binary-dra.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
env:
DRA_PROJECT: "elastic-agent-core"
DRA_ARTIFACT_SET: "agent-core"
RUN_SNAPSHOT: "true"
RUN_STAGING: "true"
FORCE_NO_DRA_DRY_RUN: "true"
Expand Down Expand Up @@ -27,8 +29,7 @@ steps:
provider: "gcp"
machineType: "c2-standard-16"
env:
DRA_PROJECT: "elastic-agent-core"
DRA_ARTIFACT_SET: "agent-core"

WORKFLOW: "snapshot"

- group: ":beats: DRA Elastic-Agent Core Staging :beats:"
Expand All @@ -55,8 +56,6 @@ steps:
provider: "gcp"
machineType: "c2-standard-16"
env:
DRA_PROJECT: "elastic-agent-core"
DRA_ARTIFACT_SET: "agent-core"
WORKFLOW: "staging"

notify:
Expand Down
8 changes: 7 additions & 1 deletion .buildkite/scripts/bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,13 @@ if [[ -z "${WORKSPACE-""}" ]]; then
fi

# Retrieve version value - will match versions like 8.8.0 and also 8.8.0-er1
export BEAT_VERSION=`grep -oE '[0-9]+\.[0-9]+\.[0-9]+(\-[a-zA-Z]+[0-9]+)?' ${WORKSPACE}/version/version.go`
BEAT_VERSION=`grep -oE '[0-9]+\.[0-9]+\.[0-9]+(\-[a-zA-Z]+[0-9]+)?' ${WORKSPACE}/version/version.go`
SNAPSHOT=""
if [ "$WORKFLOW" == "snapshot" ]; then
SNAPSHOT="true"
BEAT_VERSION="${BEAT_VERSION}-SNAPSHOT"
fi
export SNAPSHOT BEAT_VERSION
export BRANCH="${BUILDKITE_BRANCH}"

# Install Go TODO: move to makefile
Expand Down
4 changes: 0 additions & 4 deletions .buildkite/scripts/steps/build-agent-core.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@ set -euo pipefail
source .buildkite/scripts/bootstrap.sh

echo "+++ Build Agent artifacts"
SNAPSHOT=""
if [ "$WORKFLOW" == "snapshot" ]; then
SNAPSHOT="true"
fi
SNAPSHOT=$SNAPSHOT mage packageAgentCore
chmod -R 777 build/distributions

Expand Down

0 comments on commit d032d9d

Please sign in to comment.