[7.17][build] Standardize docker image tarball suffixes for architectures (#224969) (#225355)

#224969

Author: jbudz

.buildkite/scripts/steps/artifacts/publish.sh

@@ -16,9 +16,9 @@ function download {
 mkdir -p target
 cd target
 
-download "kibana-$FULL_VERSION-docker-image.tar.gz"
-download "kibana-$FULL_VERSION-docker-image-aarch64.tar.gz"
-download "kibana-ubi-$FULL_VERSION-docker-image.tar.gz"
+download "kibana-$FULL_VERSION-docker-image-amd64.tar.gz"
+download "kibana-$FULL_VERSION-docker-image-arm64.tar.gz"
+download "kibana-ubi-$FULL_VERSION-docker-image-amd64.tar.gz"
 
 download "kibana-$FULL_VERSION-arm64.deb"
 download "kibana-$FULL_VERSION-amd64.deb"

.buildkite/scripts/steps/package_testing/build.sh

@@ -6,7 +6,7 @@ set -euo pipefail
 
 node scripts/build --all-platforms --debug
 
-DOCKER_FILE="kibana-$KIBANA_PKG_VERSION-SNAPSHOT-docker-image.tar.gz"
+DOCKER_FILE="kibana-$KIBANA_PKG_VERSION-SNAPSHOT-docker-image-amd64.tar.gz"
 
 cd target
 buildkite-agent artifact upload "./$DOCKER_FILE;./*.deb;./*.rpm"

.buildkite/scripts/steps/package_testing/test.sh

@@ -15,7 +15,7 @@ elif [[ "$TEST_PACKAGE" == "rpm" ]]; then
   buildkite-agent artifact download 'kibana-*-x86_64.rpm' . --build "${KIBANA_BUILD_ID:-$BUILDKITE_BUILD_ID}"
   KIBANA_IP_ADDRESS="192.168.56.6"
 elif [[ "$TEST_PACKAGE" == "docker" ]]; then
-  buildkite-agent artifact download "kibana-$KIBANA_PKG_VERSION*-docker-image.tar.gz" . --build "${KIBANA_BUILD_ID:-$BUILDKITE_BUILD_ID}"
+  buildkite-agent artifact download "kibana-$KIBANA_PKG_VERSION*-docker-image-amd64.tar.gz" . --build "${KIBANA_BUILD_ID:-$BUILDKITE_BUILD_ID}"
   KIBANA_IP_ADDRESS="192.168.56.7"
 fi
 cd ..

src/dev/build/tasks/os_packages/docker_generator/run.ts

@@ -61,7 +61,7 @@ export async function runDockerGenerator(
   const dockerBuildDate = flags.dockerBuildDate || new Date().toISOString();
   // That would produce oss, default and default-ubi7
   const dockerBuildDir = config.resolveFromRepo('build', 'kibana-docker', `default${imageFlavor}`);
-  const imageArchitecture = flags.architecture === 'aarch64' ? '-aarch64' : '';
+  const imageArchitecture = flags.architecture === 'aarch64' ? '-arm64' : '-amd64';
   const dockerTargetFilename = config.resolveFromTarget(
     `kibana${imageFlavor}-${version}-docker-image${imageArchitecture}.tar.gz`
   );

test/package/roles/install_kibana_docker/tasks/main.yml

@@ -1,13 +1,13 @@
 - name: find docker image
   find:
     paths: /packages/
-    patterns: kibana-[0-9]*-docker-image.tar.gz
+    patterns: kibana-[0-9]*-docker-image-amd64.tar.gz
   register: kibana_docker
 
 - name: load image
   become: yes
   docker_image:
-    name: "{{ kibana_docker.files[0].path | basename| regex_replace('kibana-(.*)-docker-image.tar.gz', 'docker.elastic.co/kibana/kibana:\\1') }}"
+    name: "{{ kibana_docker.files[0].path | basename| regex_replace('kibana-(.*)-docker-image-amd64.tar.gz', 'docker.elastic.co/kibana/kibana:\\1') }}"
     load_path: '{{ kibana_docker.files[0].path }}'
     timeout: 300
     source: load
@@ -17,7 +17,7 @@
   become: yes
   docker_container:
     name: kibana
-    image: "{{ kibana_docker.files[0].path | basename| regex_replace('kibana-(.*)-docker-image.tar.gz', 'docker.elastic.co/kibana/kibana:\\1') }}"
+    image: "{{ kibana_docker.files[0].path | basename| regex_replace('kibana-(.*)-docker-image-amd64.tar.gz', 'docker.elastic.co/kibana/kibana:\\1') }}"
     network_mode: host
     env:
       SERVER_HOST: 0.0.0.0