gitlab ci: run the qemu jobs on F32

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 55ca931bcb92f66d0c51dc3da14a12d7d93c2b7f..477f7bf21df4b256b81713e1ddd7e41552b4b332 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -273,11 +273,11 @@ check-merge-request:
 
 
 # This is the actual job
-fedora:31@qemu-prep:
-  extends: .fedora:31@qemu-prep
+fedora:32@qemu-prep:
+  extends: .fedora:32@qemu-prep
 
-fedora:31@qemu-forced-rebuild:
-  extends: .fedora:31@qemu-forced-rebuild
+fedora:32@qemu-forced-rebuild:
+  extends: .fedora:32@qemu-forced-rebuild
 
 
 # Pulls in the container from upstream or rebuilds it if missing
@@ -877,9 +877,9 @@ soname:
     exit 1 ;
   fi
 
-.qemu@fedora:31:
+.qemu@fedora:32:
   extends:
-    - .fedora:31
+    - .fedora:32
   stage: VM
   image: $CI_REGISTRY_IMAGE/$FDO_DISTRIBUTION_NAME/$FDO_DISTRIBUTION_VERSION:qemu-$FDO_DISTRIBUTION_TAG
   tags:
@@ -926,19 +926,19 @@ soname:
   retry:
     max: 2
     when: script_failure
-  needs: ['fedora:31@qemu-prep']
+  needs: ['fedora:32@qemu-prep']
 
 qemu:meson:
-  extends: .qemu@fedora:31
+  extends: .qemu@fedora:32
 
 qemu:meson:valgrind:
-  extends: .qemu@fedora:31
+  extends: .qemu@fedora:32
   variables:
     MESON_TEST_ARGS: '--setup=valgrind'
 
 meson-from-tarball:
   extends:
-    - .fedora:31
+    - .fedora:32
   stage: tarballs
   script:
     - export INSTALLDIR="$PWD/_inst"
@@ -956,11 +956,11 @@ meson-from-tarball:
     - ninja -C "$MESON_BUILDDIR" install
     - popd > /dev/null
     - ls -lR $INSTALLDIR
-  needs: ['fedora:31@container-prep']
+  needs: ['fedora:32@container-prep']
 
 autotools-from-tarball:
   extends:
-    - .fedora:31
+    - .fedora:32
   stage: tarballs
   script:
     - export INSTALLDIR="$PWD/_inst"
@@ -978,4 +978,4 @@ autotools-from-tarball:
     - popd > /dev/null
     - popd > /dev/null
     - ls -lR $INSTALLDIR
-  needs: ['fedora:31@container-prep']
\ No newline at end of file
+  needs: ['fedora:32@container-prep']
\ No newline at end of file

diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template
index aa7e90cf4e1c871a827b56b2acc5e7a9edacd36d..db9fdf212312c08abb7a01f45cdff6e538f3e363 100644 (file)
--- a/.gitlab-ci/ci.template
+++ b/.gitlab-ci/ci.template
@@ -175,11 +175,11 @@ check-merge-request:
 {% endfor %}
 
 # This is the actual job
-fedora:31@qemu-prep:
-  extends: .fedora:31@qemu-prep
+fedora:32@qemu-prep:
+  extends: .fedora:32@qemu-prep
 
-fedora:31@qemu-forced-rebuild:
-  extends: .fedora:31@qemu-forced-rebuild
+fedora:32@qemu-forced-rebuild:
+  extends: .fedora:32@qemu-forced-rebuild
 
 {% for distro in distributions %}
 {% for version in distro.versions %}
@@ -437,9 +437,9 @@ soname:
     exit 1 ;
   fi
 
-.qemu@fedora:31:
+.qemu@fedora:32:
   extends:
-    - .fedora:31
+    - .fedora:32
   stage: VM
   image: $CI_REGISTRY_IMAGE/$FDO_DISTRIBUTION_NAME/$FDO_DISTRIBUTION_VERSION:qemu-$FDO_DISTRIBUTION_TAG
   tags:
@@ -486,19 +486,19 @@ soname:
   retry:
     max: 2
     when: script_failure
-  needs: ['fedora:31@qemu-prep']
+  needs: ['fedora:32@qemu-prep']
 
 qemu:meson:
-  extends: .qemu@fedora:31
+  extends: .qemu@fedora:32
 
 qemu:meson:valgrind:
-  extends: .qemu@fedora:31
+  extends: .qemu@fedora:32
   variables:
     MESON_TEST_ARGS: '--setup=valgrind'
 
 meson-from-tarball:
   extends:
-    - .fedora:31
+    - .fedora:32
   stage: tarballs
   script:
     - export INSTALLDIR="$PWD/_inst"
@@ -516,11 +516,11 @@ meson-from-tarball:
     - ninja -C "$MESON_BUILDDIR" install
     - popd > /dev/null
     - ls -lR $INSTALLDIR
-  needs: ['fedora:31@container-prep']
+  needs: ['fedora:32@container-prep']
 
 autotools-from-tarball:
   extends:
-    - .fedora:31
+    - .fedora:32
   stage: tarballs
   script:
     - export INSTALLDIR="$PWD/_inst"
@@ -538,4 +538,4 @@ autotools-from-tarball:
     - popd > /dev/null
     - popd > /dev/null
     - ls -lR $INSTALLDIR
-  needs: ['fedora:31@container-prep']
+  needs: ['fedora:32@container-prep']