From 4e2dcfcb8259840b4609593a2e8382e62a99f84a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
Date: Tue, 23 Nov 2021 12:09:00 +0000
Subject: [PATCH] ci: replace Fedora 33 with Fedora 35
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 ...ora-33.Dockerfile => fedora-35.Dockerfile} |  2 +-
 ci/gitlab.yml                                 | 32 +++++++++----------
 ci/manifest.yml                               |  4 +--
 3 files changed, 19 insertions(+), 19 deletions(-)
 rename ci/containers/{fedora-33.Dockerfile => fedora-35.Dockerfile} (98%)

diff --git a/ci/containers/fedora-33.Dockerfile b/ci/containers/fedora-35.Dockerfile
similarity index 98%
rename from ci/containers/fedora-33.Dockerfile
rename to ci/containers/fedora-35.Dockerfile
index 0025e66d6a..1c5cb2c8ca 100644
--- a/ci/containers/fedora-33.Dockerfile
+++ b/ci/containers/fedora-35.Dockerfile
@@ -4,7 +4,7 @@
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
-FROM registry.fedoraproject.org/fedora:33
+FROM registry.fedoraproject.org/fedora:35
 
 RUN dnf install -y nosync && \
     echo -e '#!/bin/sh\n\
diff --git a/ci/gitlab.yml b/ci/gitlab.yml
index 70e80f51b7..964e93d6d4 100644
--- a/ci/gitlab.yml
+++ b/ci/gitlab.yml
@@ -115,13 +115,6 @@ x86_64-debian-sid-container:
     NAME: debian-sid
 
 
-x86_64-fedora-33-container:
-  extends: .container_job
-  allow_failure: false
-  variables:
-    NAME: fedora-33
-
-
 x86_64-fedora-34-container:
   extends: .container_job
   allow_failure: false
@@ -129,6 +122,13 @@ x86_64-fedora-34-container:
     NAME: fedora-34
 
 
+x86_64-fedora-35-container:
+  extends: .container_job
+  allow_failure: false
+  variables:
+    NAME: fedora-35
+
+
 x86_64-fedora-rawhide-container:
   extends: .container_job
   allow_failure: true
@@ -425,15 +425,6 @@ x86_64-debian-sid:
     NAME: debian-sid
 
 
-x86_64-fedora-33:
-  extends: .native_build_job
-  needs:
-    - x86_64-fedora-33-container
-  allow_failure: false
-  variables:
-    NAME: fedora-33
-
-
 x86_64-fedora-34:
   extends: .native_build_job
   needs:
@@ -443,6 +434,15 @@ x86_64-fedora-34:
     NAME: fedora-34
 
 
+x86_64-fedora-35:
+  extends: .native_build_job
+  needs:
+    - x86_64-fedora-35-container
+  allow_failure: false
+  variables:
+    NAME: fedora-35
+
+
 x86_64-fedora-rawhide:
   extends: .native_build_job
   needs:
diff --git a/ci/manifest.yml b/ci/manifest.yml
index 49d5fe7064..460fdb4d34 100644
--- a/ci/manifest.yml
+++ b/ci/manifest.yml
@@ -125,10 +125,10 @@ targets:
       - arch: s390x
         allow-failure: true
 
-  fedora-33: x86_64
-
   fedora-34: x86_64
 
+  fedora-35: x86_64
+
   fedora-rawhide:
     jobs:
       - arch: x86_64