[libvirt PATCH 4/4] ci: Move nonstandard jobs from Fedora 35 to Fedora 36

Andrea Bolognani abologna at redhat.com
Thu May 26 09:05:34 UTC 2022


Signed-off-by: Andrea Bolognani <abologna at redhat.com>
---
 ...erfile => fedora-36-cross-mingw32.Dockerfile} |  2 +-
 ...erfile => fedora-36-cross-mingw64.Dockerfile} |  2 +-
 ci/gitlab/builds.yml                             | 14 +++++++-------
 ci/gitlab/containers.yml                         |  8 ++++----
 ci/integration.yml                               | 16 ++++++++--------
 ci/manifest.yml                                  |  6 +++---
 6 files changed, 24 insertions(+), 24 deletions(-)
 rename ci/containers/{fedora-35-cross-mingw32.Dockerfile => fedora-36-cross-mingw32.Dockerfile} (98%)
 rename ci/containers/{fedora-35-cross-mingw64.Dockerfile => fedora-36-cross-mingw64.Dockerfile} (98%)

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 3cc5e7b59b..76659d696a 100644
--- 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 b6662f6da7..0bccf0738c 100644
--- 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 b55143018b..5306ba6377 100644
--- a/ci/gitlab/builds.yml
+++ b/ci/gitlab/builds.yml
@@ -136,10 +136,6 @@ x86_64-fedora-35:
   allow_failure: false
   variables:
     NAME: fedora-35
-  artifacts:
-    expire_in: 1 day
-    paths:
-      - libvirt-rpms
 
 
 x86_64-fedora-36:
@@ -150,6 +146,10 @@ x86_64-fedora-36:
   allow_failure: false
   variables:
     NAME: fedora-36
+  artifacts:
+    expire_in: 1 day
+    paths:
+      - libvirt-rpms
 
 
 x86_64-fedora-rawhide:
@@ -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 635bc516e3..5b8a91c295 100644
--- 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/integration.yml b/ci/integration.yml
index 5b60b41e85..baf25e9aae 100644
--- a/ci/integration.yml
+++ b/ci/integration.yml
@@ -49,24 +49,24 @@ fedora-35-tests:
   tags:
     - $LIBVIRT_CI_INTEGRATION_RUNNER_TAG
 
-fedora-35-upstream-qemu-tests:
-  extends: .integration_tests_upstream_qemu
+fedora-36-tests:
+  extends: .integration_tests
   needs:
-    - x86_64-fedora-35
+    - x86_64-fedora-36
     - project: libvirt/libvirt-perl
-      job: x86_64-fedora-35
+      job: x86_64-fedora-36
       ref: master
       artifacts: true
   variables:
     # needed by libvirt-gitlab-executor
-    DISTRO: fedora-35
+    DISTRO: fedora-36
     # can be overridden in forks to set a different runner tag
     LIBVIRT_CI_INTEGRATION_RUNNER_TAG: redhat-vm-host
   tags:
     - $LIBVIRT_CI_INTEGRATION_RUNNER_TAG
 
-fedora-36-tests:
-  extends: .integration_tests
+fedora-36-upstream-qemu-tests:
+  extends: .integration_tests_upstream_qemu
   needs:
     - x86_64-fedora-36
     - project: libvirt/libvirt-perl
@@ -75,7 +75,7 @@ fedora-36-tests:
       artifacts: true
   variables:
     # needed by libvirt-gitlab-executor
-    DISTRO: fedora-36
+    DISTRO: fedora-35
     # can be overridden in forks to set a different runner tag
     LIBVIRT_CI_INTEGRATION_RUNNER_TAG: redhat-vm-host
   tags:
diff --git a/ci/manifest.yml b/ci/manifest.yml
index 8c43d2e917..c5f1b52487 100644
--- a/ci/manifest.yml
+++ b/ci/manifest.yml
@@ -144,7 +144,9 @@ targets:
       - arch: s390x
         allow-failure: true
 
-  fedora-35:
+  fedora-35: x86_64
+
+  fedora-36:
     jobs:
       - arch: x86_64
         artifacts:
@@ -158,8 +160,6 @@ targets:
 
       - arch: mingw64
 
-  fedora-36: x86_64
-
   fedora-rawhide:
     jobs:
       - arch: x86_64
-- 
2.35.3



More information about the libvir-list mailing list