gitlab CI: make the tarball distro selection automatic

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0cb1cab442170d66294cc816d80277ecde379a87..7fb518cb8231ea6ee791457504d946da0820b2f5 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -952,4 +952,4 @@ autotools-from-tarball:
     - popd > /dev/null
     - popd > /dev/null
     - ls -lR $INSTALLDIR
-  needs: ['fedora:32@container-prep']
\ No newline at end of file
+  needs: ['fedora:32@container-prep']

diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template
index de4c6b8f7dc312ecef7aca5a431761dcdc91234d..8d964cbc74c2acf4fc86b1d0b87bc3bc6e87c74a 100644 (file)
--- a/.gitlab-ci/ci.template
+++ b/.gitlab-ci/ci.template
@@ -494,9 +494,11 @@ qemu:meson:valgrind:
     MESON_TEST_ARGS: '--setup=valgrind'
 {% endfor %}
 
+{% for distro in distributions if distro.use_for_tarball_tests %}
+{% set version = "{}".format(distro.versions|last()) %}
 meson-from-tarball:
   extends:
-    - .fedora:32
+    - .{{distro.name}}:{{version}}
   stage: tarballs
   script:
     - export INSTALLDIR="$PWD/_inst"
@@ -514,11 +516,11 @@ meson-from-tarball:
     - ninja -C "$MESON_BUILDDIR" install
     - popd > /dev/null
     - ls -lR $INSTALLDIR
-  needs: ['fedora:32@container-prep']
+  needs: ['{{distro.name}}:{{version}}@container-prep']
 
 autotools-from-tarball:
   extends:
-    - .fedora:32
+    - .{{distro.name}}:{{version}}
   stage: tarballs
   script:
     - export INSTALLDIR="$PWD/_inst"
@@ -536,4 +538,5 @@ autotools-from-tarball:
     - popd > /dev/null
     - popd > /dev/null
     - ls -lR $INSTALLDIR
-  needs: ['fedora:32@container-prep']
+  needs: ['{{distro.name}}:{{version}}@container-prep']
+{% endfor %}

diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml
index 720385a5017f58249e7ae9cc3b4e76954cafb644..e059148bc876eec0f92e672eb47c76c9f5eafe50 100644 (file)
--- a/.gitlab-ci/config.yml
+++ b/.gitlab-ci/config.yml
@@ -9,6 +9,7 @@ distributions:
   - name: fedora
     tag: *default_tag
     want_qemu: true
+    use_for_tarball_tests: true
     versions:
       - '33'
       - '32'