gitlab-ci: x86_test-base image as common base for x86_test-gl/vk
Making use of the relatively recent FDO_BASE_IMAGE feature of the
templates, the x86_test-base image contents are shared as a separate
layer by the x86_test-gl/vk images (meaning the former only needs to be
downloaded once for either or both of the latter). This should be more
efficient in terms of overall network bandwidth and storage, in
particular if the base image changes less often than the -gl/vk ones.
v2:
* List x86_test-base in needs: along with x86_test-gl/vk (see parent
commit)
* Always put $STABLE/TESTING_EPHEMERAL on separate lines, will make it
easier to add any non-ephemeral packages
Reviewed-by: Eric Anholt <eric@anholt.net> # v1
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5186>
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c3b2c03..6e28b47 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,6 +10,7 @@
stages:
- container
+ - container-2
- meson-x86_64
- scons
- meson-misc
@@ -145,17 +146,34 @@
needs:
- x86_build
-# Debian 10 based x86 test image for GL
-x86_test-gl:
+# Debian 10 based x86 test image base
+x86_test-base:
extends: x86_build
variables:
- FDO_DISTRIBUTION_TAG: &x86_test-gl "2020-05-18"
+ FDO_DISTRIBUTION_TAG: &x86_test-base "2020-05-23"
+
+.use-x86_test-base:
+ extends:
+ - x86_build
+ - .ci-run-policy
+ stage: container-2
+ variables:
+ BASE_TAG: *x86_test-base
+ FDO_BASE_IMAGE: "$CI_REGISTRY_IMAGE/debian/x86_test-base:$BASE_TAG"
+ needs:
+ - x86_test-base
+
+# Debian 10 based x86 test image for GL
+x86_test-gl:
+ extends: .use-x86_test-base
+ variables:
+ FDO_DISTRIBUTION_TAG: &x86_test-gl "2020-05-23"
# Debian 10 based x86 test image for VK
x86_test-vk:
- extends: x86_build
+ extends: .use-x86_test-base
variables:
- FDO_DISTRIBUTION_TAG: &x86_test-vk "2020-05-18"
+ FDO_DISTRIBUTION_TAG: &x86_test-vk "2020-05-23"
# Debian 9 based x86 build image (old LLVM)
x86_build_old:
@@ -622,6 +640,7 @@
needs:
- x86_build
- meson-testing
+ - x86_test-base
- x86_test-gl
.test-vk:
@@ -633,6 +652,7 @@
needs:
- x86_build
- meson-testing
+ - x86_test-base
- x86_test-vk
.piglit-test: