Skip to content

Commit

Permalink
[CI] Fix Core DRA crossbuild (#7203) (#7246)
Browse files Browse the repository at this point in the history
* [CI] Fix DRA crossbuild

* Added staging fix

* Fixed mistype

* Fixed darwin build

* Update .buildkite/pipeline.elastic-agent-binary-dra.yml

Co-authored-by: Paolo Chilà <paolo.chila@elastic.co>

* Update .buildkite/pipeline.elastic-agent-binary-dra.yml

Co-authored-by: Paolo Chilà <paolo.chila@elastic.co>

* replaced commas with spaces

---------

Co-authored-by: Paolo Chilà <paolo.chila@elastic.co>
(cherry picked from commit d0548da)

Co-authored-by: Pavel Zorin <pavel.zorin@elastic.co>
  • Loading branch information
mergify[bot] and pazone authored Mar 7, 2025
1 parent 2c7fa0d commit 1384b14
Showing 1 changed file with 35 additions and 4 deletions.
39 changes: 35 additions & 4 deletions .buildkite/pipeline.elastic-agent-binary-dra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,32 @@ steps:
# don't run snapshot builds with prereleases (non empty VERSION_QUALIFIER) unless forced (RUN_SNAPSHOT=true)
if: build.env("RUN_SNAPSHOT") == "true" || (build.env('VERSION_QUALIFIER') == null && (build.branch == 'main' || build.branch =~ /^[0-9]+\.[0-9x]+\$/))
steps:
- label: ":package: Build Elastic-Agent Core Snapshot"
- label: ":package: Elastic-Agent Core Snapshot"
commands:
- .buildkite/scripts/steps/build-agent-core.sh
key: "build-dra-snapshot"
key: "build-dra-snapshot-x86"
artifact_paths:
- "build/distributions/**/*"
agents:
provider: "gcp"
machineType: "c2-standard-16"
env:
DRA_WORKFLOW: "snapshot"
PLATFORMS: "linux/amd64 windows/amd64 darwin/amd64 darwin/arm64"

- label: ":package: linux/arm64 Elastic-Agent Core Snapshot"
commands:
- .buildkite/scripts/steps/build-agent-core.sh
key: "build-dra-snapshot-arm"
artifact_paths:
- "build/distributions/**/*"
agents:
provider: "aws"
instanceType: "c6g.4xlarge"
imagePrefix: "core-ubuntu-2204-aarch64"
env:
DRA_WORKFLOW: "snapshot"
PLATFORMS: "linux/arm64"

- wait

Expand All @@ -46,18 +61,34 @@ steps:
key: "dra-core-staging"
if: build.branch =~ /^[0-9]+\.[0-9x]+\$/ || build.env("RUN_STAGING") == "true" || build.env('VERSION_QUALIFIER') != null
steps:
- label: ":package: Build Elastic-Agent Core staging"
- label: ":package: Elastic-Agent Core staging"
commands: |
source .buildkite/scripts/version_qualifier.sh
.buildkite/scripts/steps/build-agent-core.sh
key: "build-dra-staging"
key: "build-dra-staging-x86"
artifact_paths:
- "build/distributions/**/*"
agents:
provider: "gcp"
machineType: "c2-standard-16"
env:
DRA_WORKFLOW: "staging"
PLATFORMS: "linux/amd64 windows/amd64 darwin/amd64 darwin/arm64"

- label: ":package: linux/arm64 Elastic-Agent Core staging"
commands: |
source .buildkite/scripts/version_qualifier.sh
.buildkite/scripts/steps/build-agent-core.sh
key: "build-dra-staging-arm"
artifact_paths:
- "build/distributions/**/*"
agents:
provider: "aws"
instanceType: "c6g.4xlarge"
imagePrefix: "core-ubuntu-2204-aarch64"
env:
DRA_WORKFLOW: "dra-core-staging"
PLATFORMS: "linux/arm64"

- wait

Expand Down

0 comments on commit 1384b14

Please sign in to comment.