ci/bare-metal: Don't include dev packages in arm*test.

We just need these to build our rootfs, clean them out afterwards.

Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5433>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index edec580a39fa45854fb2009921c2272ba92662ac..59ebcf4015a0288ae98c6e362a55be03f771aeec 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -305,7 +305,7 @@ arm64_test:
   extends:
     - .use-arm_test-base
   variables:
-    FDO_DISTRIBUTION_TAG: &arm64_test "2020-06-22-stable"
+    FDO_DISTRIBUTION_TAG: &arm64_test "2020-06-22-ephemeral"
 
 .use-arm64_test:
   variables:

diff --git a/.gitlab-ci/container/baremetal_build.sh b/.gitlab-ci/container/baremetal_build.sh
index 0f697f0c75ccdd3df93ebc53317820de91cdeb8a..b84608f87e9eb1b1f44fc547c8619025e19a0d78 100644 (file)
--- a/.gitlab-ci/container/baremetal_build.sh
+++ b/.gitlab-ci/container/baremetal_build.sh
@@ -7,7 +7,7 @@ dpkg --add-architecture $arch
 apt-get update
 
 # Cross-build test deps
-apt-get install -y --no-remove \
+BAREMETAL_EPHEMERAL=" \
         crossbuild-essential-$arch \
         libdrm-dev:$arch \
         libegl1-mesa-dev:$arch \
@@ -21,6 +21,9 @@ apt-get install -y --no-remove \
         libtinfo-dev:$arch \
         libegl1-mesa-dev:$arch \
         libvulkan-dev:$arch
+        "
+
+apt-get install -y --no-remove $BAREMETAL_EPHEMERAL
 
 mkdir /var/cache/apt/archives/$arch
 
@@ -37,3 +40,5 @@ DEBIAN_ARCH=$arch INCLUDE_VK_CTS=1 . .gitlab-ci/container/lava_arm.sh
 ccache --show-stats
 
 . .gitlab-ci/container/container_post_build.sh
+
+apt-get purge -y $BAREMETAL_EPHEMERAL