[libvirt PATCH] ci: Refresh and add Fedora 37 target

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



This patch pulls in latest lcitool changes mainly though moves onto Fedora
37 over Fedora 35 which is dropped.

Test pipeline (ignore non-Fedora 37 stuff):
https://gitlab.com/eskultety/libvirt/-/pipelines/741518165

Signed-off-by: Erik Skultety <eskultet@xxxxxxxxxx>
---
 ...-mingw32.sh => fedora-37-cross-mingw32.sh} |   0
 ...-mingw64.sh => fedora-37-cross-mingw64.sh} |   0
 ci/buildenv/{fedora-35.sh => fedora-37.sh}    |   1 -
 ci/cirrus/macos-12.vars                       |  10 +-
 ...ile => fedora-37-cross-mingw32.Dockerfile} |   2 +-
 ...ile => fedora-37-cross-mingw64.Dockerfile} |   2 +-
 ...ora-35.Dockerfile => fedora-37.Dockerfile} |   3 +-
 ci/gitlab/builds.yml                          |  76 ++++++-------
 ci/gitlab/containers.yml                      |  22 ++--
 ci/integration.yml                            | 104 +++++++++---------
 ci/manifest.yml                               |  16 +--
 11 files changed, 117 insertions(+), 119 deletions(-)
 rename ci/buildenv/{fedora-36-cross-mingw32.sh => fedora-37-cross-mingw32.sh} (100%)
 rename ci/buildenv/{fedora-36-cross-mingw64.sh => fedora-37-cross-mingw64.sh} (100%)
 rename ci/buildenv/{fedora-35.sh => fedora-37.sh} (99%)
 rename ci/containers/{fedora-36-cross-mingw32.Dockerfile => fedora-37-cross-mingw32.Dockerfile} (98%)
 rename ci/containers/{fedora-36-cross-mingw64.Dockerfile => fedora-37-cross-mingw64.Dockerfile} (98%)
 rename ci/containers/{fedora-35.Dockerfile => fedora-37.Dockerfile} (97%)

diff --git a/ci/buildenv/fedora-36-cross-mingw32.sh b/ci/buildenv/fedora-37-cross-mingw32.sh
similarity index 100%
rename from ci/buildenv/fedora-36-cross-mingw32.sh
rename to ci/buildenv/fedora-37-cross-mingw32.sh
diff --git a/ci/buildenv/fedora-36-cross-mingw64.sh b/ci/buildenv/fedora-37-cross-mingw64.sh
similarity index 100%
rename from ci/buildenv/fedora-36-cross-mingw64.sh
rename to ci/buildenv/fedora-37-cross-mingw64.sh
diff --git a/ci/buildenv/fedora-35.sh b/ci/buildenv/fedora-37.sh
similarity index 99%
rename from ci/buildenv/fedora-35.sh
rename to ci/buildenv/fedora-37.sh
index 2ee8c901e5..23886ae77c 100644
--- a/ci/buildenv/fedora-35.sh
+++ b/ci/buildenv/fedora-37.sh
@@ -58,7 +58,6 @@ function install_buildenv() {
         lvm2 \
         make \
         meson \
-        netcf-devel \
         nfs-utils \
         ninja-build \
         numactl-devel \
diff --git a/ci/cirrus/macos-12.vars b/ci/cirrus/macos-12.vars
index a5afb4eb4d..8ecc9c4450 100644
--- a/ci/cirrus/macos-12.vars
+++ b/ci/cirrus/macos-12.vars
@@ -4,13 +4,13 @@
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
-CCACHE='/usr/local/bin/ccache'
+CCACHE='/opt/homebrew/bin/ccache'
 CPAN_PKGS=''
 CROSS_PKGS=''
-MAKE='/usr/local/bin/gmake'
-NINJA='/usr/local/bin/ninja'
+MAKE='/opt/homebrew/bin/gmake'
+NINJA='/opt/homebrew/bin/ninja'
 PACKAGING_COMMAND='brew'
-PIP3='/usr/local/bin/pip3'
+PIP3='/opt/homebrew/bin/pip3'
 PKGS='augeas bash-completion ccache codespell cppi curl diffutils docutils flake8 gettext git glib gnu-sed gnutls grep libiscsi libpcap libssh libssh2 libxml2 libxslt make meson ninja perl pkg-config python3 qemu readline rpcgen scrub yajl'
 PYPI_PKGS=''
-PYTHON='/usr/local/bin/python3'
+PYTHON='/opt/homebrew/bin/python3'
diff --git a/ci/containers/fedora-36-cross-mingw32.Dockerfile b/ci/containers/fedora-37-cross-mingw32.Dockerfile
similarity index 98%
rename from ci/containers/fedora-36-cross-mingw32.Dockerfile
rename to ci/containers/fedora-37-cross-mingw32.Dockerfile
index 24b2760c18..14fb25a17e 100644
--- a/ci/containers/fedora-36-cross-mingw32.Dockerfile
+++ b/ci/containers/fedora-37-cross-mingw32.Dockerfile
@@ -4,7 +4,7 @@
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
-FROM registry.fedoraproject.org/fedora:36
+FROM registry.fedoraproject.org/fedora:37
 
 RUN dnf install -y nosync && \
     echo -e '#!/bin/sh\n\
diff --git a/ci/containers/fedora-36-cross-mingw64.Dockerfile b/ci/containers/fedora-37-cross-mingw64.Dockerfile
similarity index 98%
rename from ci/containers/fedora-36-cross-mingw64.Dockerfile
rename to ci/containers/fedora-37-cross-mingw64.Dockerfile
index a3369209da..c468dd7a6c 100644
--- a/ci/containers/fedora-36-cross-mingw64.Dockerfile
+++ b/ci/containers/fedora-37-cross-mingw64.Dockerfile
@@ -4,7 +4,7 @@
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
-FROM registry.fedoraproject.org/fedora:36
+FROM registry.fedoraproject.org/fedora:37
 
 RUN dnf install -y nosync && \
     echo -e '#!/bin/sh\n\
diff --git a/ci/containers/fedora-35.Dockerfile b/ci/containers/fedora-37.Dockerfile
similarity index 97%
rename from ci/containers/fedora-35.Dockerfile
rename to ci/containers/fedora-37.Dockerfile
index f517cf9443..17f586af59 100644
--- a/ci/containers/fedora-35.Dockerfile
+++ b/ci/containers/fedora-37.Dockerfile
@@ -4,7 +4,7 @@
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
-FROM registry.fedoraproject.org/fedora:35
+FROM registry.fedoraproject.org/fedora:37
 
 RUN dnf install -y nosync && \
     echo -e '#!/bin/sh\n\
@@ -69,7 +69,6 @@ exec "$@"' > /usr/bin/nosync && \
                lvm2 \
                make \
                meson \
-               netcf-devel \
                nfs-utils \
                ninja-build \
                numactl-devel \
diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml
index 0e2daebe97..89c15fa28d 100644
--- a/ci/gitlab/builds.yml
+++ b/ci/gitlab/builds.yml
@@ -193,32 +193,6 @@ x86_64-debian-sid-local-env:
     NAME: debian-sid
 
 
-x86_64-fedora-35-prebuilt-env:
-  extends: .native_build_job_prebuilt_env
-  needs:
-    - job: x86_64-fedora-35-container
-      optional: true
-  allow_failure: false
-  variables:
-    NAME: fedora-35
-  artifacts:
-    expire_in: 1 day
-    paths:
-      - libvirt-rpms
-
-x86_64-fedora-35-local-env:
-  extends: .native_build_job_local_env
-  needs: []
-  allow_failure: false
-  variables:
-    IMAGE: registry.fedoraproject.org/fedora:35
-    NAME: fedora-35
-  artifacts:
-    expire_in: 1 day
-    paths:
-      - libvirt-rpms
-
-
 x86_64-fedora-36-prebuilt-env:
   extends: .native_build_job_prebuilt_env
   needs:
@@ -245,6 +219,32 @@ x86_64-fedora-36-local-env:
       - libvirt-rpms
 
 
+x86_64-fedora-37-prebuilt-env:
+  extends: .native_build_job_prebuilt_env
+  needs:
+    - job: x86_64-fedora-37-container
+      optional: true
+  allow_failure: false
+  variables:
+    NAME: fedora-37
+  artifacts:
+    expire_in: 1 day
+    paths:
+      - libvirt-rpms
+
+x86_64-fedora-37-local-env:
+  extends: .native_build_job_local_env
+  needs: []
+  allow_failure: false
+  variables:
+    IMAGE: registry.fedoraproject.org/fedora:37
+    NAME: fedora-37
+  artifacts:
+    expire_in: 1 day
+    paths:
+      - libvirt-rpms
+
+
 x86_64-fedora-rawhide-prebuilt-env:
   extends: .native_build_job_prebuilt_env
   needs:
@@ -746,46 +746,46 @@ s390x-debian-sid-local-env:
     NAME: debian-sid
 
 
-mingw32-fedora-36-prebuilt-env:
+mingw32-fedora-37-prebuilt-env:
   extends: .cross_build_job_prebuilt_env
   needs:
-    - job: mingw32-fedora-36-container
+    - job: mingw32-fedora-37-container
       optional: true
   allow_failure: false
   variables:
     CROSS: mingw32
     JOB_OPTIONAL: 1
-    NAME: fedora-36
+    NAME: fedora-37
 
-mingw32-fedora-36-local-env:
+mingw32-fedora-37-local-env:
   extends: .cross_build_job_local_env
   needs: []
   allow_failure: false
   variables:
     CROSS: mingw32
-    IMAGE: registry.fedoraproject.org/fedora:36
+    IMAGE: registry.fedoraproject.org/fedora:37
     JOB_OPTIONAL: 1
-    NAME: fedora-36
+    NAME: fedora-37
 
 
-mingw64-fedora-36-prebuilt-env:
+mingw64-fedora-37-prebuilt-env:
   extends: .cross_build_job_prebuilt_env
   needs:
-    - job: mingw64-fedora-36-container
+    - job: mingw64-fedora-37-container
       optional: true
   allow_failure: false
   variables:
     CROSS: mingw64
-    NAME: fedora-36
+    NAME: fedora-37
 
-mingw64-fedora-36-local-env:
+mingw64-fedora-37-local-env:
   extends: .cross_build_job_local_env
   needs: []
   allow_failure: false
   variables:
     CROSS: mingw64
-    IMAGE: registry.fedoraproject.org/fedora:36
-    NAME: fedora-36
+    IMAGE: registry.fedoraproject.org/fedora:37
+    NAME: fedora-37
 
 
 mingw32-fedora-rawhide-prebuilt-env:
diff --git a/ci/gitlab/containers.yml b/ci/gitlab/containers.yml
index 1b7f63955b..fa426bd3a6 100644
--- a/ci/gitlab/containers.yml
+++ b/ci/gitlab/containers.yml
@@ -56,13 +56,6 @@ x86_64-debian-sid-container:
     NAME: debian-sid
 
 
-x86_64-fedora-35-container:
-  extends: .container_job
-  allow_failure: false
-  variables:
-    NAME: fedora-35
-
-
 x86_64-fedora-36-container:
   extends: .container_job
   allow_failure: false
@@ -70,6 +63,13 @@ x86_64-fedora-36-container:
     NAME: fedora-36
 
 
+x86_64-fedora-37-container:
+  extends: .container_job
+  allow_failure: false
+  variables:
+    NAME: fedora-37
+
+
 x86_64-fedora-rawhide-container:
   extends: .container_job
   allow_failure: true
@@ -235,19 +235,19 @@ s390x-debian-sid-container:
     NAME: debian-sid-cross-s390x
 
 
-mingw32-fedora-36-container:
+mingw32-fedora-37-container:
   extends: .container_job
   allow_failure: false
   variables:
     JOB_OPTIONAL: 1
-    NAME: fedora-36-cross-mingw32
+    NAME: fedora-37-cross-mingw32
 
 
-mingw64-fedora-36-container:
+mingw64-fedora-37-container:
   extends: .container_job
   allow_failure: false
   variables:
-    NAME: fedora-36-cross-mingw64
+    NAME: fedora-37-cross-mingw64
 
 
 mingw32-fedora-rawhide-container:
diff --git a/ci/integration.yml b/ci/integration.yml
index b79d2e0f40..2bdda1d3c1 100644
--- a/ci/integration.yml
+++ b/ci/integration.yml
@@ -81,46 +81,6 @@ centos-stream-9-tests-local-env:
       artifacts: true
 
 
-.fedora-35-tests:
-  variables:
-    # needed by libvirt-gitlab-executor
-    DISTRO: fedora-35
-    # 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-35-tests-prebuilt-env:
-  extends:
-    - .integration_tests_prebuilt_env
-    - .fedora-35-tests
-  needs:
-    - x86_64-fedora-35-prebuilt-env
-    - project: libvirt/libvirt-perl
-      job: x86_64-fedora-35-prebuilt-env
-      ref: master
-      artifacts: true
-    - project: libvirt/libvirt-python
-      job: x86_64-fedora-35-prebuilt-env
-      ref: master
-      artifacts: true
-
-fedora-35-tests-local-env:
-  extends:
-    - .integration_tests_local_env
-    - .fedora-35-tests
-  needs:
-    - x86_64-fedora-35-local-env
-    - project: libvirt/libvirt-perl
-      job: x86_64-fedora-35-prebuilt-env
-      ref: master
-      artifacts: true
-    - project: libvirt/libvirt-python
-      job: x86_64-fedora-35-prebuilt-env
-      ref: master
-      artifacts: true
-
-
 .fedora-36-tests:
   variables:
     # needed by libvirt-gitlab-executor
@@ -161,41 +121,81 @@ fedora-36-tests-local-env:
       artifacts: true
 
 
-.fedora-36-upstream-qemu-tests:
+.fedora-37-tests:
   variables:
     # needed by libvirt-gitlab-executor
-    DISTRO: fedora-36
+    DISTRO: fedora-37
     # 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-upstream-qemu-tests-prebuilt-env:
+fedora-37-tests-prebuilt-env:
   extends:
     - .integration_tests_prebuilt_env
-    - .fedora-36-upstream-qemu-tests
+    - .fedora-37-tests
   needs:
-    - x86_64-fedora-36-prebuilt-env
+    - x86_64-fedora-37-prebuilt-env
     - project: libvirt/libvirt-perl
-      job: x86_64-fedora-36-prebuilt-env
+      job: x86_64-fedora-37-prebuilt-env
       ref: master
       artifacts: true
     - project: libvirt/libvirt-python
-      job: x86_64-fedora-36-prebuilt-env
+      job: x86_64-fedora-37-prebuilt-env
       ref: master
       artifacts: true
 
-fedora-36-upstream-qemu-tests-local-env:
+fedora-37-tests-local-env:
   extends:
     - .integration_tests_local_env
-    - .fedora-36-upstream-qemu-tests
+    - .fedora-37-tests
   needs:
-    - x86_64-fedora-36-local-env
+    - x86_64-fedora-37-local-env
     - project: libvirt/libvirt-perl
-      job: x86_64-fedora-36-prebuilt-env
+      job: x86_64-fedora-37-prebuilt-env
       ref: master
       artifacts: true
     - project: libvirt/libvirt-python
-      job: x86_64-fedora-36-prebuilt-env
+      job: x86_64-fedora-37-prebuilt-env
+      ref: master
+      artifacts: true
+
+
+.fedora-37-upstream-qemu-tests:
+  variables:
+    # needed by libvirt-gitlab-executor
+    DISTRO: fedora-37
+    # 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-37-upstream-qemu-tests-prebuilt-env:
+  extends:
+    - .integration_tests_prebuilt_env
+    - .fedora-37-upstream-qemu-tests
+  needs:
+    - x86_64-fedora-37-prebuilt-env
+    - project: libvirt/libvirt-perl
+      job: x86_64-fedora-37-prebuilt-env
+      ref: master
+      artifacts: true
+    - project: libvirt/libvirt-python
+      job: x86_64-fedora-37-prebuilt-env
+      ref: master
+      artifacts: true
+
+fedora-37-upstream-qemu-tests-local-env:
+  extends:
+    - .integration_tests_local_env
+    - .fedora-37-upstream-qemu-tests
+  needs:
+    - x86_64-fedora-37-local-env
+    - project: libvirt/libvirt-perl
+      job: x86_64-fedora-37-prebuilt-env
+      ref: master
+      artifacts: true
+    - project: libvirt/libvirt-python
+      job: x86_64-fedora-37-prebuilt-env
       ref: master
       artifacts: true
diff --git a/ci/manifest.yml b/ci/manifest.yml
index 2aec92dd26..2aa9ce9952 100644
--- a/ci/manifest.yml
+++ b/ci/manifest.yml
@@ -116,14 +116,6 @@ targets:
         containers: false
         builds: false
 
-  fedora-35:
-    jobs:
-      - arch: x86_64
-        artifacts:
-          expire_in: 1 day
-          paths:
-            - libvirt-rpms
-
   fedora-36:
     jobs:
       - arch: x86_64
@@ -132,6 +124,14 @@ targets:
           paths:
             - libvirt-rpms
 
+  fedora-37:
+    jobs:
+      - arch: x86_64
+        artifacts:
+          expire_in: 1 day
+          paths:
+            - libvirt-rpms
+
       - arch: mingw32
         builds: false
 
-- 
2.39.0




[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]

  Powered by Linux