ci: Move MinGW jobs to Fedora 36

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>

diff --git a/ci/containers/fedora-35-cross-mingw32.Dockerfile b/ci/containers/fedora-36-cross-mingw32.Dockerfile
similarity index 98%
rename from ci/containers/fedora-35-cross-mingw32.Dockerfile
rename to ci/containers/fedora-36-cross-mingw32.Dockerfile
index 3cc5e7b59b527f690b84ea58a50c8114f1b12ac7..76659d696a9df25a9f1aea4905706aa47c889e0c 100644 (file)
--- a/ci/containers/fedora-35-cross-mingw32.Dockerfile
+++ b/ci/containers/fedora-36-cross-mingw32.Dockerfile
@@ -4,7 +4,7 @@
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
-FROM registry.fedoraproject.org/fedora:35
+FROM registry.fedoraproject.org/fedora:36
 
 RUN dnf install -y nosync && \
     echo -e '#!/bin/sh\n\

diff --git a/ci/containers/fedora-35-cross-mingw64.Dockerfile b/ci/containers/fedora-36-cross-mingw64.Dockerfile
similarity index 98%
rename from ci/containers/fedora-35-cross-mingw64.Dockerfile
rename to ci/containers/fedora-36-cross-mingw64.Dockerfile
index b6662f6da7ee90905586b9725ab35550366cd620..0bccf0738c0bedbf9147204d40c9623973898263 100644 (file)
--- a/ci/containers/fedora-35-cross-mingw64.Dockerfile
+++ b/ci/containers/fedora-36-cross-mingw64.Dockerfile
@@ -4,7 +4,7 @@
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
-FROM registry.fedoraproject.org/fedora:35
+FROM registry.fedoraproject.org/fedora:36
 
 RUN dnf install -y nosync && \
     echo -e '#!/bin/sh\n\

diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml
index b55143018b8d4cb798185e3618231dc8382d8e88..d136b0776e5cbe029eb283b6f9e5783f13841752 100644 (file)
--- a/ci/gitlab/builds.yml
+++ b/ci/gitlab/builds.yml
@@ -334,15 +334,15 @@ s390x-debian-sid:
     NAME: debian-sid
 
 
-mingw64-fedora-35:
+mingw64-fedora-36:
   extends: .cross_build_job
   needs:
-    - job: mingw64-fedora-35-container
+    - job: mingw64-fedora-36-container
       optional: true
   allow_failure: false
   variables:
     CROSS: mingw64
-    NAME: fedora-35
+    NAME: fedora-36
 
 
 mingw32-fedora-rawhide:

diff --git a/ci/gitlab/containers.yml b/ci/gitlab/containers.yml
index 635bc516e3f646f0c7c1acbd094b02a60f01ce0c..5b8a91c295c1319ed5ebb901303c10540b523f74 100644 (file)
--- a/ci/gitlab/containers.yml
+++ b/ci/gitlab/containers.yml
@@ -297,18 +297,18 @@ s390x-debian-sid-container:
     NAME: debian-sid-cross-s390x
 
 
-mingw32-fedora-35-container:
+mingw32-fedora-36-container:
   extends: .container_job
   allow_failure: true
   variables:
-    NAME: fedora-35-cross-mingw32
+    NAME: fedora-36-cross-mingw32
 
 
-mingw64-fedora-35-container:
+mingw64-fedora-36-container:
   extends: .container_job
   allow_failure: false
   variables:
-    NAME: fedora-35-cross-mingw64
+    NAME: fedora-36-cross-mingw64
 
 
 mingw32-fedora-rawhide-container:

diff --git a/ci/manifest.yml b/ci/manifest.yml
index 8c43d2e9175f04ba6a537b44e76c4d46ee90bdb6..e85a01018e6d057662e0c0fa4a6295213982ff9b 100644 (file)
--- a/ci/manifest.yml
+++ b/ci/manifest.yml
@@ -152,14 +152,16 @@ targets:
           paths:
             - libvirt-rpms
 
+  fedora-36:
+    jobs:
+      - arch: x86_64
+
       - arch: mingw32
         allow-failure: true
         builds: false
 
       - arch: mingw64
 
-  fedora-36: x86_64
-
   fedora-rawhide:
     jobs:
       - arch: x86_64