Skip to content

Commit be0cf2a

Browse files
authored
[8.19] Standardize image artifacts name (#17757)
Standardize the arch in image artifact name to amd64 (instead of x86_64), and arm64 (instead of aarch64)
1 parent 3c87715 commit be0cf2a

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

.buildkite/scripts/dra/build_docker.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ for file in build/logstash-*; do shasum $file;done
4545
info "Uploading DRA artifacts in buildkite's artifact store ..."
4646
# Note the deb, rpm tar.gz AARCH64 files generated has already been loaded by the build_packages.sh
4747
images="logstash logstash-oss logstash-wolfi"
48-
if [ "$ARCH" != "aarch64" ]; then
48+
if [ "$ARCH" != "arm64" ]; then
4949
# No logstash-ubi8 for AARCH64
5050
images="logstash logstash-oss logstash-wolfi logstash-ubi8"
5151
fi

.buildkite/scripts/dra/common.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ function save_docker_tarballs {
1111
local arch="${1:?architecture required}"
1212
local version="${2:?stack-version required}"
1313
local images="logstash logstash-oss logstash-wolfi"
14-
if [ "${arch}" != "aarch64" ]; then
14+
if [ "${arch}" != "arm64" ]; then
1515
# No logstash-ubi8 for AARCH64
1616
images="logstash logstash-oss logstash-wolfi logstash-ubi8"
1717
fi

.buildkite/scripts/dra/publish.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ fi
4747
# See https://github.com/elastic/infra/blob/master/cd/release/release-manager/project-configs/8.5/logstash.gradle
4848
# for more details.
4949
# TODO filter it out when uploading artifacts instead
50-
rm -f build/logstash-ubi8-${STACK_VERSION}-docker-image-aarch64.tar.gz
50+
rm -f build/logstash-ubi8-${STACK_VERSION}-docker-image-arm64.tar.gz
5151

5252
info "Downloaded ARTIFACTS sha report"
5353
for file in build/logstash-*; do shasum $file;done

0 commit comments

Comments
 (0)