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

Hi Martin,

The pipeline failed, and I'm assuming this is because Fedora 33 is out
of support.  The log is not very helpful:

https://gitlab.com/nbdkit/libnbd/-/jobs/1874368914

Also we don't seem to have lcitool in Fedora anywhere obvious, so
instead I just updated the generated files directly.

Also, wouldn't it be nice if we could specify "fedora:n" and
"fedora:n-1" instead of having to update this every six months ...

Rich.

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

On Sat, Dec 11, 2021 at 02:49:29PM +0000, Richard W.M. Jones
wrote:
>Hi Martin,
>
>The pipeline failed, and I'm assuming this is because Fedora 33 is out
>of support.  The log is not very helpful:
>
That should not have anything related to it.
>https://gitlab.com/nbdkit/libnbd/-/jobs/1874368914
>
It seems that "docker push" timed out, there aren't many logs to
look
at.
>Also we don't seem to have lcitool in Fedora anywhere obvious, so
>instead I just updated the generated files directly.
>
It is not shipped anywhere because it wouldn't make sense to use
anything older than current master, just clone it from:

   https://gitlab.com/libvirt/libvirt-ci/
>Also, wouldn't it be nice if we could specify "fedora:n" and
>"fedora:n-1" instead of having to update this every six months ...
>
Good idea, but I think it would be more difficult than changing one line
and running a script.  But don't hesitate to suggest it upstream, maybe
Andrea or Daniel are working on something like that already.
>Rich.
>
>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL:
<http://listman.redhat.com/archives/libguestfs/attachments/20211211/3cc911d7/attachment.sig>