[Libguestfs] [PATCH libnbd CI] ci: Drop Fedora 33, add Fedora 35

Richard W.M. Jones rjones at redhat.com
Sat Dec 11 14:49:30 UTC 2021


Failed pipeline:
https://gitlab.com/nbdkit/libnbd/-/jobs/1874368914
---
 ...ora-33.Dockerfile => fedora-35.Dockerfile} |  2 +-
 ci/gitlab.yml                                 | 32 +++++++++----------
 ci/manifest.yml                               |  4 +--
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/ci/containers/fedora-33.Dockerfile b/ci/containers/fedora-35.Dockerfile
similarity index 97%
rename from ci/containers/fedora-33.Dockerfile
rename to ci/containers/fedora-35.Dockerfile
index 9c0bfa954..bc63cc845 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 df3f68ad5..2e0d0f38c 100644
--- a/ci/gitlab.yml
+++ b/ci/gitlab.yml
@@ -116,13 +116,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
@@ -130,6 +123,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: false
@@ -257,15 +257,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:
@@ -275,6 +266,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 704d4fbb9..d487dda6b 100644
--- a/ci/manifest.yml
+++ b/ci/manifest.yml
@@ -35,10 +35,10 @@ targets:
 
   debian-sid: x86_64
 
-  fedora-33: x86_64
-
   fedora-34: x86_64
 
+  fedora-35: x86_64
+
   fedora-rawhide:
     jobs:
       - arch: x86_64
-- 
2.32.0




More information about the Libguestfs mailing list