Skip to content

Commit f2621b0

Browse files
authored
Ensure acceptance test artifacts are being built for correct arch (#18079)
* Ensure acceptance test artifacts are being built for correct arch With the improvment in #17995 we only build packages that match the architecture of the host. This is specified with an enviornment variable. Previously the acceptance tests did not need to specifcy the architecture when building packages. This commit updates the builder to build packages with the correct arch. * Ensure ARCH is set for docker acceptance tests
1 parent 398a66c commit f2621b0

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

.buildkite/aarch64_pipeline.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ steps:
133133
- label: "Docker [{{matrix}}] flavor acceptance"
134134
command:
135135
set -euo pipefail
136-
136+
export ARCH="aarch64"
137137
source .buildkite/scripts/common/vm-agent.sh && ci/docker_acceptance_tests.sh {{matrix}}
138138
retry:
139139
automatic:

.buildkite/scripts/exhaustive-tests/generate-steps.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ def acceptance_linux_steps() -> list[typing.Any]:
125125
source .buildkite/scripts/common/vm-agent.sh
126126
echo "--- Building all artifacts"
127127
./gradlew clean bootstrap
128+
export ARCH="x86_64"
128129
rake artifact:deb artifact:rpm
129130
"""),
130131
"artifact_paths": [
@@ -162,6 +163,7 @@ def acceptance_docker_steps()-> list[typing.Any]:
162163
"command": LiteralScalarString(f"""#!/usr/bin/env bash
163164
set -euo pipefail
164165
source .buildkite/scripts/common/vm-agent.sh
166+
export ARCH="x86_64"
165167
ci/docker_acceptance_tests.sh {flavor}"""),
166168
"retry": {"automatic": [{"limit": 3}]},
167169
})

0 commit comments

Comments
 (0)