From d946c062d86221308eb43af626b75bc099ee0e18 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun, 22 Mar 2020 11:31:03 +1000
Subject: gitlab CI: update the various build tests to F32

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 .gitlab-ci/ci.template | 42 +++++++++++++++++++++---------------------
 .gitlab-ci/config.yml  |  1 +
 2 files changed, 22 insertions(+), 21 deletions(-)

(limited to '.gitlab-ci')

diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template
index ead6b524..087ebfeb 100644
--- a/.gitlab-ci/ci.template
+++ b/.gitlab-ci/ci.template
@@ -177,7 +177,7 @@ check-commit:
     # force rebuild if schedule, reuse otherwise
     - if [[ $CI_PIPELINE_SOURCE == "schedule" ]] ; then export FDO_FORCE_REBUILD=1; fi
 
-fedora:30@qemu-prep:
+fedora:32@qemu-prep:
   extends:
     - .fdo.qemu-build@fedora
     - .policy
@@ -187,7 +187,7 @@ fedora:30@qemu-prep:
     - kvm
   variables:
     GIT_STRATEGY: none
-    FDO_DISTRIBUTION_VERSION: 30
+    FDO_DISTRIBUTION_VERSION: 32
     FDO_DISTRIBUTION_TAG: $QEMU_TAG
     FDO_DISTRIBUTION_PACKAGES: $FEDORA_QEMU_RPMS
   allow_failure: true
@@ -410,19 +410,19 @@ freebsd:11.2@container-clean:
     when: script_failure
 
 
-.fedora:30@test-suite-vm:
+.fedora:32@test-suite-vm:
   extends:
     - .test-suite-vm
   variables:
-    FDO_DISTRIBUTION_VERSION: 30
+    FDO_DISTRIBUTION_VERSION: 32
     FDO_DISTRIBUTION_TAG: $QEMU_TAG
-  needs: ['fedora:30@qemu-prep']
+  needs: ['fedora:32@qemu-prep']
 
 
 {% for suite in test_suites %}
 vm-{{suite.name}}:
   extends:
-    - .fedora:30@test-suite-vm
+    - .fedora:32@test-suite-vm
   variables:
     SUITE_NAMES: '{{suite.suites}}'
 
@@ -450,11 +450,11 @@ vm-valgrind-{{suite.name}}:
     - .fdo.distribution-image@fedora
     - .build@template
   variables:
-    FDO_DISTRIBUTION_VERSION: '30'
+    FDO_DISTRIBUTION_VERSION: '32'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
-  needs: ['fedora:30@container-prep']
+  needs: ['fedora:32@container-prep']
 
-default-build-release@fedora:30:
+default-build-release@fedora:32:
   stage: distro
   extends:
     - .fedora-build@template
@@ -462,7 +462,7 @@ default-build-release@fedora:30:
     MESON_ARGS: "-Dbuildtype=release"
     CFLAGS: "-Werror"
 
-scan-build@fedora:30:
+scan-build@fedora:32:
   extends:
     - .fedora-build@template
   variables:
@@ -480,13 +480,13 @@ scan-build@fedora:30:
 # run them on one image, they shouldn't fail on one distro
 # when they succeed on another.
 
-build-no-libwacom@fedora:30:
+build-no-libwacom@fedora:32:
   extends:
     - .fedora-build@template
   variables:
     MESON_ARGS: "-Dlibwacom=false"
 
-build-no-libwacom-nodeps@fedora:30:
+build-no-libwacom-nodeps@fedora:32:
   extends:
     - .fedora-build@template
   variables:
@@ -494,13 +494,13 @@ build-no-libwacom-nodeps@fedora:30:
   before_script:
     - dnf remove -y libwacom libwacom-devel
 
-build-no-docs@fedora:30:
+build-no-docs@fedora:32:
   extends:
     - .fedora-build@template
   variables:
     MESON_ARGS: "-Ddocumentation=false"
 
-build-no-docs-nodeps@fedora:30:
+build-no-docs-nodeps@fedora:32:
   extends:
     - .fedora-build@template
   variables:
@@ -508,13 +508,13 @@ build-no-docs-nodeps@fedora:30:
   before_script:
     - dnf remove -y doxygen graphviz
 
-build-no-debuggui@fedora:30:
+build-no-debuggui@fedora:32:
   extends:
     - .fedora-build@template
   variables:
     MESON_ARGS: "-Ddebug-gui=false"
 
-build-no-debuggui-nodeps@fedora:30:
+build-no-debuggui-nodeps@fedora:32:
   extends:
     - .fedora-build@template
   variables:
@@ -522,13 +522,13 @@ build-no-debuggui-nodeps@fedora:30:
   before_script:
     - dnf remove -y gtk3-devel
 
-build-no-tests@fedora:30:
+build-no-tests@fedora:32:
   extends:
     - .fedora-build@template
   variables:
     MESON_ARGS: "-Dtests=false"
 
-build-no-tests-nodeps@fedora:30:
+build-no-tests-nodeps@fedora:32:
   extends:
     - .fedora-build@template
   variables:
@@ -536,7 +536,7 @@ build-no-tests-nodeps@fedora:30:
   before_script:
     - dnf remove -y check-devel
 
-valgrind@fedora:30:
+valgrind@fedora:32:
   extends:
     - .fedora-build@template
   variables:
@@ -546,7 +546,7 @@ valgrind@fedora:30:
 
 # Python checks, only run on Fedora
 
-usr-bin-env-python@fedora:30:
+usr-bin-env-python@fedora:32:
   extends:
     - .fedora-build@template
   script:
@@ -556,7 +556,7 @@ usr-bin-env-python@fedora:30:
         /bin/false
       fi
 
-flake8@fedora:30:
+flake8@fedora:32:
   extends:
     - .fedora-build@template
   before_script:
diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml
index 70d2f8ac..f97b2d5d 100644
--- a/.gitlab-ci/config.yml
+++ b/.gitlab-ci/config.yml
@@ -11,6 +11,7 @@ distributions:
     versions:
       - '30'
       - '31'
+      - '32'
     want_qemu: true
     ci_templates: true
   - name: ubuntu
-- 
cgit v1.2.1