ci: Merge ARM testing docker images to a single arm_test one

The merged image contains kernels & rootfs for both arm64 & armhf
baremetal test jobs, and is smaller than either arm{64,hf}_test image
before.

Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9955>

5 files changed, 9 insertions, 16 deletions

diff --git a/.gitlab-ci/container/arm64_test.sh b/.gitlab-ci/container/arm64_test.sh
deleted file mode 100644
index 98e3b4ab0b0..00000000000
--- a/.gitlab-ci/container/arm64_test.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-arch=arm64
-
-. .gitlab-ci/container/baremetal_build.sh
diff --git a/.gitlab-ci/container/arm_test-base.sh b/.gitlab-ci/container/arm_test.sh
index ef26837cb3e..95b013f2560 100644
--- a/.gitlab-ci/container/arm_test-base.sh
+++ b/.gitlab-ci/container/arm_test.sh
@@ -27,3 +27,6 @@ apt-get install -y --no-remove \
 # setup nginx
 sed -i '/gzip_/ s/#\ //g' /etc/nginx/nginx.conf
 cp .gitlab-ci/bare-metal/nginx-default-site  /etc/nginx/sites-enabled/default
+
+arch=arm64 . .gitlab-ci/container/baremetal_build.sh
+arch=armhf . .gitlab-ci/container/baremetal_build.sh
diff --git a/.gitlab-ci/container/armhf_test.sh b/.gitlab-ci/container/armhf_test.sh
deleted file mode 100644
index da0cf9e2eb7..00000000000
--- a/.gitlab-ci/container/armhf_test.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-arch=armhf
-
-. .gitlab-ci/container/baremetal_build.sh
diff --git a/.gitlab-ci/container/baremetal_build.sh b/.gitlab-ci/container/baremetal_build.sh
index aaf4c1fb2a5..4f22a408bcb 100644
--- a/.gitlab-ci/container/baremetal_build.sh
+++ b/.gitlab-ci/container/baremetal_build.sh
@@ -6,15 +6,15 @@ set -o xtrace
 # Fetch the arm-built rootfs image and unpack it in our x86 container (saves
 # network transfer, disk usage, and runtime on test jobs)
 
-if wget -q --method=HEAD "${ARTIFACTS_PREFIX}/${FDO_UPSTREAM_REPO}/${ARTIFACTS_SUFFIX}/done"; then
-  ARTIFACTS_URL="${ARTIFACTS_PREFIX}/${FDO_UPSTREAM_REPO}/${ARTIFACTS_SUFFIX}"
+if wget -q --method=HEAD "${ARTIFACTS_PREFIX}/${FDO_UPSTREAM_REPO}/${ARTIFACTS_SUFFIX}/${arch}/done"; then
+  ARTIFACTS_URL="${ARTIFACTS_PREFIX}/${FDO_UPSTREAM_REPO}/${ARTIFACTS_SUFFIX}/${arch}"
 else
-  ARTIFACTS_URL="${ARTIFACTS_PREFIX}/${CI_PROJECT_PATH}/${ARTIFACTS_SUFFIX}"
+  ARTIFACTS_URL="${ARTIFACTS_PREFIX}/${CI_PROJECT_PATH}/${ARTIFACTS_SUFFIX}/${arch}"
 fi
 
 wget ${ARTIFACTS_URL}/lava-rootfs.tgz -O rootfs.tgz
-mkdir -p /rootfs
-tar -C /rootfs -zxvf rootfs.tgz
+mkdir -p /rootfs-$arch
+tar -C /rootfs-$arch -zxf rootfs.tgz
 rm rootfs.tgz
 
 if [[ $arch == "arm64" ]]; then
diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml
index 0389cc026a6..af5f28acdc1 100644
--- a/.gitlab-ci/lava-gitlab-ci.yml
+++ b/.gitlab-ci/lava-gitlab-ci.yml
@@ -4,6 +4,7 @@
   stage: container-2
   variables:
     GIT_STRATEGY: fetch
+    DISTRIBUTION_TAG: &distribution-tag-arm "${MESA_ROOTFS_TAG}--${MESA_IMAGE_TAG}--${MESA_TEMPLATES_COMMIT}"
   script:
     - .gitlab-ci/container/lava_build.sh
 
@@ -12,7 +13,6 @@
     - .kernel+rootfs
   variables:
     KERNEL_URL: "https://gitlab.freedesktop.org/tomeu/linux/-/archive/v5.10-rc2-for-mesa-ci/linux-v5.10-rc2-for-mesa-ci.tar.gz"
-    DISTRIBUTION_TAG: &distribution-tag-arm "${MESA_ROOTFS_TAG}--${MESA_IMAGE_TAG}--${MESA_TEMPLATES_COMMIT}"
     INSTALL_KERNEL_MODULES: 1
     MESA_ROOTFS_TAG: &lava-rootfs "2021-03-31-libxrender"
     MINIO_SUFFIX: "lava"