Skip to content

Commit 5ea0dca

Browse files
Pavel Zorinpchila
authored and
mergify[bot]
committed
[CI] Fix Core DRA crossbuild (#7203)
* [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)
1 parent eee438b commit 5ea0dca

File tree

1 file changed

+35
-4
lines changed

1 file changed

+35
-4
lines changed

‎.buildkite/pipeline.elastic-agent-binary-dra.yml‎

Lines changed: 35 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,32 @@ steps:
1313
# don't run snapshot builds with prereleases (non empty VERSION_QUALIFIER) unless forced (RUN_SNAPSHOT=true)
1414
if: build.env("RUN_SNAPSHOT") == "true" || (build.env('VERSION_QUALIFIER') == null && (build.branch == 'main' || build.branch =~ /^[0-9]+\.[0-9x]+\$/))
1515
steps:
16-
- label: ":package: Build Elastic-Agent Core Snapshot"
16+
- label: ":package: Elastic-Agent Core Snapshot"
1717
commands:
1818
- .buildkite/scripts/steps/build-agent-core.sh
19-
key: "build-dra-snapshot"
19+
key: "build-dra-snapshot-x86"
2020
artifact_paths:
2121
- "build/distributions/**/*"
2222
agents:
2323
provider: "gcp"
2424
machineType: "c2-standard-16"
2525
env:
2626
DRA_WORKFLOW: "snapshot"
27+
PLATFORMS: "linux/amd64 windows/amd64 darwin/amd64 darwin/arm64"
28+
29+
- label: ":package: linux/arm64 Elastic-Agent Core Snapshot"
30+
commands:
31+
- .buildkite/scripts/steps/build-agent-core.sh
32+
key: "build-dra-snapshot-arm"
33+
artifact_paths:
34+
- "build/distributions/**/*"
35+
agents:
36+
provider: "aws"
37+
instanceType: "c6g.4xlarge"
38+
imagePrefix: "core-ubuntu-2204-aarch64"
39+
env:
40+
DRA_WORKFLOW: "snapshot"
41+
PLATFORMS: "linux/arm64"
2742

2843
- wait
2944

@@ -46,18 +61,34 @@ steps:
4661
key: "dra-core-staging"
4762
if: build.branch =~ /^[0-9]+\.[0-9x]+\$/ || build.env("RUN_STAGING") == "true" || build.env('VERSION_QUALIFIER') != null
4863
steps:
49-
- label: ":package: Build Elastic-Agent Core staging"
64+
- label: ":package: Elastic-Agent Core staging"
5065
commands: |
5166
source .buildkite/scripts/version_qualifier.sh
5267
.buildkite/scripts/steps/build-agent-core.sh
53-
key: "build-dra-staging"
68+
key: "build-dra-staging-x86"
5469
artifact_paths:
5570
- "build/distributions/**/*"
5671
agents:
5772
provider: "gcp"
5873
machineType: "c2-standard-16"
5974
env:
6075
DRA_WORKFLOW: "staging"
76+
PLATFORMS: "linux/amd64 windows/amd64 darwin/amd64 darwin/arm64"
77+
78+
- label: ":package: linux/arm64 Elastic-Agent Core staging"
79+
commands: |
80+
source .buildkite/scripts/version_qualifier.sh
81+
.buildkite/scripts/steps/build-agent-core.sh
82+
key: "build-dra-staging-arm"
83+
artifact_paths:
84+
- "build/distributions/**/*"
85+
agents:
86+
provider: "aws"
87+
instanceType: "c6g.4xlarge"
88+
imagePrefix: "core-ubuntu-2204-aarch64"
89+
env:
90+
DRA_WORKFLOW: "dra-core-staging"
91+
PLATFORMS: "linux/arm64"
6192

6293
- wait
6394

0 commit comments

Comments
 (0)