ci: Move ARM rootfses to stable

We build in Debian buster but were currently testing in bullseye-based
ramdisks. This has started being a problem since Python 3.7 was removed
from bullseye.

[ Also bumped arm_test containers, by anholt ]

Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Acked-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5433>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4b8713bb0268944b04208b68c8ce5b0cdf9a19e2..edec580a39fa45854fb2009921c2272ba92662ac 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -272,7 +272,7 @@ arm_build:
     - .fdo.container-build@debian@arm64v8
     - .container
   variables:
-    FDO_DISTRIBUTION_TAG: &arm_build "2020-06-12"
+    FDO_DISTRIBUTION_TAG: &arm_build "2020-06-22-stable"
 
 .use-arm_build:
   variables:
@@ -287,7 +287,7 @@ arm_test-base:
     - .fdo.container-build@debian
     - .container
   variables:
-    FDO_DISTRIBUTION_TAG: &arm_test-base "2020-06-09-rsync"
+    FDO_DISTRIBUTION_TAG: &arm_test-base "2020-06-22-stable"
 
 .use-arm_test-base:
   extends:
@@ -305,7 +305,7 @@ arm64_test:
   extends:
     - .use-arm_test-base
   variables:
-    FDO_DISTRIBUTION_TAG: &arm64_test "2020-06-18-vkcts"
+    FDO_DISTRIBUTION_TAG: &arm64_test "2020-06-22-stable"
 
 .use-arm64_test:
   variables:

diff --git a/.gitlab-ci/container/lava_arm.sh b/.gitlab-ci/container/lava_arm.sh
index b5412804fbb6729205110ce1a4808810e6411598..05bc602aa6f9a15c25897fa1b13bfccf654b2ba3 100644 (file)
--- a/.gitlab-ci/container/lava_arm.sh
+++ b/.gitlab-ci/container/lava_arm.sh
@@ -78,7 +78,7 @@ debootstrap \
     --variant=minbase \
     --arch=${DEBIAN_ARCH} \
      --components main,contrib,non-free \
-    testing \
+    buster \
     /lava-files/rootfs-${DEBIAN_ARCH}/ \
     http://deb.debian.org/debian