gitlab CI: update to use F32

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

.gitlab-ci.yml

@@ -77,64 +77,64 @@ variables:
   script:
     - .gitlab-ci/meson-build.sh
 
-.fedora:30:
-  extends: .fdo.distribution-image@fedora
-  variables:
-    FDO_DISTRIBUTION_TAG: '2020-03-17.0'
-    FDO_DISTRIBUTION_VERSION: '30'
-
 .fedora:31:
   extends: .fdo.distribution-image@fedora
   variables:
-    FDO_DISTRIBUTION_TAG: '2020-03-17.0'
+    FDO_DISTRIBUTION_TAG: '2020-09-11.0'
     FDO_DISTRIBUTION_VERSION: '31'
 
+.fedora:32:
+  extends: .fdo.distribution-image@fedora
+  variables:
+    FDO_DISTRIBUTION_TAG: '2020-09-11.0'
+    FDO_DISTRIBUTION_VERSION: '32'
+
 .ubuntu:20.04:
   extends: .fdo.distribution-image@ubuntu
   variables:
-    FDO_DISTRIBUTION_TAG: '2020-03-17.0'
+    FDO_DISTRIBUTION_TAG: '2020-09-11.0'
     FDO_DISTRIBUTION_VERSION: '20.04'
 
 .ubuntu:19.10:
   extends: .fdo.distribution-image@ubuntu
   variables:
-    FDO_DISTRIBUTION_TAG: '2020-03-17.0'
+    FDO_DISTRIBUTION_TAG: '2020-09-11.0'
     FDO_DISTRIBUTION_VERSION: '19.10'
 
 .debian:stable:
   extends: .fdo.distribution-image@debian
   variables:
-    FDO_DISTRIBUTION_TAG: '2020-03-17.0'
+    FDO_DISTRIBUTION_TAG: '2020-09-11.0'
     FDO_DISTRIBUTION_VERSION: 'stable'
 
 .debian:sid:
   extends: .fdo.distribution-image@debian
   variables:
-    FDO_DISTRIBUTION_TAG: '2020-03-17.0'
+    FDO_DISTRIBUTION_TAG: '2020-09-11.0'
     FDO_DISTRIBUTION_VERSION: 'sid'
 
 .centos:7:
   extends: .fdo.distribution-image@centos
   variables:
-    FDO_DISTRIBUTION_TAG: '2020-03-17.0'
+    FDO_DISTRIBUTION_TAG: '2020-09-11.0'
     FDO_DISTRIBUTION_VERSION: '7'
 
 .centos:8:
   extends: .fdo.distribution-image@centos
   variables:
-    FDO_DISTRIBUTION_TAG: '2020-03-17.0'
+    FDO_DISTRIBUTION_TAG: '2020-09-11.0'
     FDO_DISTRIBUTION_VERSION: '8'
 
 .arch:rolling:
   extends: .fdo.distribution-image@arch
   variables:
-    FDO_DISTRIBUTION_TAG: '2020-03-17.0'
+    FDO_DISTRIBUTION_TAG: '2020-09-11.0'
     FDO_DISTRIBUTION_VERSION: 'rolling'
 
 .alpine:latest:
   extends: .fdo.distribution-image@alpine
   variables:
-    FDO_DISTRIBUTION_TAG: '2020-03-17.0'
+    FDO_DISTRIBUTION_TAG: '2020-09-11.0'
     FDO_DISTRIBUTION_VERSION: 'latest'
 
 
@@ -225,29 +225,6 @@ check-merge-request:
     FDO_DISTRIBUTION_PACKAGES: 'git gcc g++ meson automake autoconf libtool make pkgconfig python3 check-dev valgrind binutils doxygen xz linux-headers'
 
 
-# Pulls in the qemu container from upstream or rebuilds it if missing
-.fedora:30@qemu-prep:
-  extends:
-    - .fedora:30
-    - .fedora.packages
-    - .fdo.qemu-build@fedora
-  stage: prep
-  tags:
-    - kvm
-  variables:
-    GIT_STRATEGY: none
-    FDO_DISTRIBUTION_TAG: qemu-2020-03-17.0
-  allow_failure: true
-
-# Always rebuilds the container
-.fedora:30@qemu-forced-rebuild:
-  extends:
-    - .fedora:30@qemu-prep
-  variables:
-    FDO_FORCE_REBUILD: 1
-  only:
-    - schedules
-
 # Pulls in the qemu container from upstream or rebuilds it if missing
 .fedora:31@qemu-prep:
   extends:
@@ -259,7 +236,7 @@ check-merge-request:
     - kvm
   variables:
     GIT_STRATEGY: none
-    FDO_DISTRIBUTION_TAG: qemu-2020-03-17.0
+    FDO_DISTRIBUTION_TAG: qemu-2020-09-11.0
   allow_failure: true
 
 # Always rebuilds the container
@@ -271,6 +248,29 @@ check-merge-request:
   only:
     - schedules
 
+# Pulls in the qemu container from upstream or rebuilds it if missing
+.fedora:32@qemu-prep:
+  extends:
+    - .fedora:32
+    - .fedora.packages
+    - .fdo.qemu-build@fedora
+  stage: prep
+  tags:
+    - kvm
+  variables:
+    GIT_STRATEGY: none
+    FDO_DISTRIBUTION_TAG: qemu-2020-09-11.0
+  allow_failure: true
+
+# Always rebuilds the container
+.fedora:32@qemu-forced-rebuild:
+  extends:
+    - .fedora:32@qemu-prep
+  variables:
+    FDO_FORCE_REBUILD: 1
+  only:
+    - schedules
+
 
 # This is the actual job
 fedora:31@qemu-prep:
@@ -280,26 +280,6 @@ fedora:31@qemu-forced-rebuild:
   extends: .fedora:31@qemu-forced-rebuild
 
 
-# Pulls in the container from upstream or rebuilds it if missing
-fedora:30@container-prep:
-  extends:
-    - .fedora:30
-    - .fedora.packages
-    - .fdo.container-build@fedora
-  stage: prep
-  variables:
-    GIT_STRATEGY: none
-
-# Always rebuilds the container
-fedora:30@container-forced-rebuild:
-  extends:
-    - fedora:30@container-prep
-  only:
-    - schedules
-  variables:
-    FDO_FORCE_REBUILD: 1
-
-
 # Pulls in the container from upstream or rebuilds it if missing
 fedora:31@container-prep:
   extends:
@@ -320,6 +300,26 @@ fedora:31@container-forced-rebuild:
     FDO_FORCE_REBUILD: 1
 
 
+# Pulls in the container from upstream or rebuilds it if missing
+fedora:32@container-prep:
+  extends:
+    - .fedora:32
+    - .fedora.packages
+    - .fdo.container-build@fedora
+  stage: prep
+  variables:
+    GIT_STRATEGY: none
+
+# Always rebuilds the container
+fedora:32@container-forced-rebuild:
+  extends:
+    - fedora:32@container-prep
+  only:
+    - schedules
+  variables:
+    FDO_FORCE_REBUILD: 1
+
+
 # Pulls in the container from upstream or rebuilds it if missing
 ubuntu:20.04@container-prep:
   extends:
@@ -511,13 +511,6 @@ alpine:latest@container-forced-rebuild:
   only:
     - schedules
 
-### fedora 30
-fedora:30@container-clean:
-  extends:
-    - .fedora:30
-    - .container-clean
-  needs: ["fedora:30@container-prep"]
-
 ### fedora 31
 fedora:31@container-clean:
   extends:
@@ -525,6 +518,13 @@ fedora:31@container-clean:
     - .container-clean
   needs: ["fedora:31@container-prep"]
 
+### fedora 32
+fedora:32@container-clean:
+  extends:
+    - .fedora:32
+    - .container-clean
+  needs: ["fedora:32@container-prep"]
+
 ### ubuntu 20.04
 ubuntu:20.04@container-clean:
   extends:
@@ -605,21 +605,6 @@ alpine:latest@container-clean:
     NINJA_ARGS: "dist"
 
 
-fedora:30@autotools-build:
-  extends:
-    - .fedora:30
-    - .autotools-build@template
-  stage: autotools
-  needs: ['fedora:30@container-prep']
-
-fedora:30@meson-build:
-  extends:
-    - .fedora:30
-    - .meson-build@template
-  stage: meson
-  needs: ['fedora:30@container-prep']
-
-
 fedora:31@autotools-build:
   extends:
     - .fedora:31
@@ -635,6 +620,21 @@ fedora:31@meson-build:
   needs: ['fedora:31@container-prep']
 
 
+fedora:32@autotools-build:
+  extends:
+    - .fedora:32
+    - .autotools-build@template
+  stage: autotools
+  needs: ['fedora:32@container-prep']
+
+fedora:32@meson-build:
+  extends:
+    - .fedora:32
+    - .meson-build@template
+  stage: meson
+  needs: ['fedora:32@container-prep']
+
+
 ubuntu:20.04@autotools-build:
   extends:
     - .ubuntu:20.04

.gitlab-ci/config.yml

@@ -3,14 +3,14 @@
 #
 
 # We're happy to rebuild all containers when one changes.
-.default_tag: &default_tag '2020-03-17.0'
+.default_tag: &default_tag '2020-09-11.0'
 
 distributions:
   - name: fedora
     tag: *default_tag
     versions:
-      - '30'
       - '31'
+      - '32'
     packages:
       - git
       - gcc