gitlab CI: update to use F32

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index eeaee263cf5faf30828d7d0a85b948fd2fa33f99..55ca931bcb92f66d0c51dc3da14a12d7d93c2b7f 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -77,64 +77,64 @@ variables:
   script:
     - .gitlab-ci/meson-build.sh
 
-.fedora:30:
+.fedora:31:
   extends: .fdo.distribution-image@fedora
   variables:
-    FDO_DISTRIBUTION_TAG: '2020-03-17.0'
-    FDO_DISTRIBUTION_VERSION: '30'
+    FDO_DISTRIBUTION_TAG: '2020-09-11.0'
+    FDO_DISTRIBUTION_VERSION: '31'
 
-.fedora:31:
+.fedora:32:
   extends: .fdo.distribution-image@fedora
   variables:
-    FDO_DISTRIBUTION_TAG: '2020-03-17.0'
-    FDO_DISTRIBUTION_VERSION: '31'
+    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'
 
 
@@ -226,9 +226,9 @@ check-merge-request:
 
 
 # Pulls in the qemu container from upstream or rebuilds it if missing
-.fedora:30@qemu-prep:
+.fedora:31@qemu-prep:
   extends:
-    - .fedora:30
+    - .fedora:31
     - .fedora.packages
     - .fdo.qemu-build@fedora
   stage: prep
@@ -236,22 +236,22 @@ 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
-.fedora:30@qemu-forced-rebuild:
+.fedora:31@qemu-forced-rebuild:
   extends:
-    - .fedora:30@qemu-prep
+    - .fedora:31@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:
+.fedora:32@qemu-prep:
   extends:
-    - .fedora:31
+    - .fedora:32
     - .fedora.packages
     - .fdo.qemu-build@fedora
   stage: prep
@@ -259,13 +259,13 @@ 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
-.fedora:31@qemu-forced-rebuild:
+.fedora:32@qemu-forced-rebuild:
   extends:
-    - .fedora:31@qemu-prep
+    - .fedora:32@qemu-prep
   variables:
     FDO_FORCE_REBUILD: 1
   only:
@@ -281,9 +281,9 @@ fedora:31@qemu-forced-rebuild:
 
 
 # Pulls in the container from upstream or rebuilds it if missing
-fedora:30@container-prep:
+fedora:31@container-prep:
   extends:
-    - .fedora:30
+    - .fedora:31
     - .fedora.packages
     - .fdo.container-build@fedora
   stage: prep
@@ -291,9 +291,9 @@ fedora:30@container-prep:
     GIT_STRATEGY: none
 
 # Always rebuilds the container
-fedora:30@container-forced-rebuild:
+fedora:31@container-forced-rebuild:
   extends:
-    - fedora:30@container-prep
+    - fedora:31@container-prep
   only:
     - schedules
   variables:
@@ -301,9 +301,9 @@ fedora:30@container-forced-rebuild:
 
 
 # Pulls in the container from upstream or rebuilds it if missing
-fedora:31@container-prep:
+fedora:32@container-prep:
   extends:
-    - .fedora:31
+    - .fedora:32
     - .fedora.packages
     - .fdo.container-build@fedora
   stage: prep
@@ -311,9 +311,9 @@ fedora:31@container-prep:
     GIT_STRATEGY: none
 
 # Always rebuilds the container
-fedora:31@container-forced-rebuild:
+fedora:32@container-forced-rebuild:
   extends:
-    - fedora:31@container-prep
+    - fedora:32@container-prep
   only:
     - schedules
   variables:
@@ -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,34 +605,34 @@ alpine:latest@container-clean:
     NINJA_ARGS: "dist"
 
 
-fedora:30@autotools-build:
+fedora:31@autotools-build:
   extends:
-    - .fedora:30
+    - .fedora:31
     - .autotools-build@template
   stage: autotools
-  needs: ['fedora:30@container-prep']
+  needs: ['fedora:31@container-prep']
 
-fedora:30@meson-build:
+fedora:31@meson-build:
   extends:
-    - .fedora:30
+    - .fedora:31
     - .meson-build@template
   stage: meson
-  needs: ['fedora:30@container-prep']
+  needs: ['fedora:31@container-prep']
 
 
-fedora:31@autotools-build:
+fedora:32@autotools-build:
   extends:
-    - .fedora:31
+    - .fedora:32
     - .autotools-build@template
   stage: autotools
-  needs: ['fedora:31@container-prep']
+  needs: ['fedora:32@container-prep']
 
-fedora:31@meson-build:
+fedora:32@meson-build:
   extends:
-    - .fedora:31
+    - .fedora:32
     - .meson-build@template
   stage: meson
-  needs: ['fedora:31@container-prep']
+  needs: ['fedora:32@container-prep']
 
 
 ubuntu:20.04@autotools-build:

diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml
index 5474fe3a0849d3388434c0497a1871a790d4b2f7..f336902effcf38e18281a52ba2a6d4bcea9b1201 100644 (file)
--- a/.gitlab-ci/config.yml
+++ b/.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