ci: Refresh and add Fedora 37 target

Signed-off-by: Erik Skultety <eskultet@redhat.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>

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 2ee8c901e520156f01ae771e8bb423f848c25222..23886ae77c6ad83a5817e0312abba8e75428fe9e 100644 (file)
--- 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 a5afb4eb4d86b405e9e1249235ef070afcdd6d04..8ecc9c44507a19c0a8830f69fb89d1f37a3d0f8e 100644 (file)
--- 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 24b2760c1860c6e6acedc7c64f6276c080f6f2c4..14fb25a17e39aefd9120faa80f992aaeee5dbcca 100644 (file)
--- 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 a3369209da0e705a00fa031d2456e1104ce0d3a1..c468dd7a6c8e2fba3c298d05257e1e2b351349f8 100644 (file)
--- 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 f517cf94432b2bcca8d892cc2e9fc4743c27afa9..17f586af59d797a79e80ceaa6a4b2eaa3b18c490 100644 (file)
--- 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 0e2daebe9708c66441b5b60f375138b84c45a344..89c15fa28da0b2168c959a52721f21165381984d 100644 (file)
--- a/ci/gitlab/builds.yml
+++ b/ci/gitlab/builds.yml
@@ -193,52 +193,52 @@ x86_64-debian-sid-local-env:
     NAME: debian-sid
 
 
-x86_64-fedora-35-prebuilt-env:
+x86_64-fedora-36-prebuilt-env:
   extends: .native_build_job_prebuilt_env
   needs:
-    - job: x86_64-fedora-35-container
+    - job: x86_64-fedora-36-container
       optional: true
   allow_failure: false
   variables:
-    NAME: fedora-35
+    NAME: fedora-36
   artifacts:
     expire_in: 1 day
     paths:
       - libvirt-rpms
 
-x86_64-fedora-35-local-env:
+x86_64-fedora-36-local-env:
   extends: .native_build_job_local_env
   needs: []
   allow_failure: false
   variables:
-    IMAGE: registry.fedoraproject.org/fedora:35
-    NAME: fedora-35
+    IMAGE: registry.fedoraproject.org/fedora:36
+    NAME: fedora-36
   artifacts:
     expire_in: 1 day
     paths:
       - libvirt-rpms
 
 
-x86_64-fedora-36-prebuilt-env:
+x86_64-fedora-37-prebuilt-env:
   extends: .native_build_job_prebuilt_env
   needs:
-    - job: x86_64-fedora-36-container
+    - job: x86_64-fedora-37-container
       optional: true
   allow_failure: false
   variables:
-    NAME: fedora-36
+    NAME: fedora-37
   artifacts:
     expire_in: 1 day
     paths:
       - libvirt-rpms
 
-x86_64-fedora-36-local-env:
+x86_64-fedora-37-local-env:
   extends: .native_build_job_local_env
   needs: []
   allow_failure: false
   variables:
-    IMAGE: registry.fedoraproject.org/fedora:36
-    NAME: fedora-36
+    IMAGE: registry.fedoraproject.org/fedora:37
+    NAME: fedora-37
   artifacts:
     expire_in: 1 day
     paths:
@@ -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 1b7f63955b62d90fe72d4b9461f834a7e6a30cde..fa426bd3a629db9a82f8b6ad680814c3d1e86d3d 100644 (file)
--- a/ci/gitlab/containers.yml
+++ b/ci/gitlab/containers.yml
@@ -56,18 +56,18 @@ x86_64-debian-sid-container:
     NAME: debian-sid
 
 
-x86_64-fedora-35-container:
+x86_64-fedora-36-container:
   extends: .container_job
   allow_failure: false
   variables:
-    NAME: fedora-35
+    NAME: fedora-36
 
 
-x86_64-fedora-36-container:
+x86_64-fedora-37-container:
   extends: .container_job
   allow_failure: false
   variables:
-    NAME: fedora-36
+    NAME: fedora-37
 
 
 x86_64-fedora-rawhide-container:
@@ -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 b79d2e0f40f390e8defc719605a03a2d5743e465..2bdda1d3c1e535126c0b0af80f6c63df3716219f 100644 (file)
--- a/ci/integration.yml
+++ b/ci/integration.yml
@@ -81,121 +81,121 @@ centos-stream-9-tests-local-env:
       artifacts: true
 
 
-.fedora-35-tests:
+.fedora-36-tests:
   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-35-tests-prebuilt-env:
+fedora-36-tests-prebuilt-env:
   extends:
     - .integration_tests_prebuilt_env
-    - .fedora-35-tests
+    - .fedora-36-tests
   needs:
-    - x86_64-fedora-35-prebuilt-env
+    - x86_64-fedora-36-prebuilt-env
     - project: libvirt/libvirt-perl
-      job: x86_64-fedora-35-prebuilt-env
+      job: x86_64-fedora-36-prebuilt-env
       ref: master
       artifacts: true
     - project: libvirt/libvirt-python
-      job: x86_64-fedora-35-prebuilt-env
+      job: x86_64-fedora-36-prebuilt-env
       ref: master
       artifacts: true
 
-fedora-35-tests-local-env:
+fedora-36-tests-local-env:
   extends:
     - .integration_tests_local_env
-    - .fedora-35-tests
+    - .fedora-36-tests
   needs:
-    - x86_64-fedora-35-local-env
+    - x86_64-fedora-36-local-env
     - project: libvirt/libvirt-perl
-      job: x86_64-fedora-35-prebuilt-env
+      job: x86_64-fedora-36-prebuilt-env
       ref: master
       artifacts: true
     - project: libvirt/libvirt-python
-      job: x86_64-fedora-35-prebuilt-env
+      job: x86_64-fedora-36-prebuilt-env
       ref: master
       artifacts: true
 
 
-.fedora-36-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-tests-prebuilt-env:
+fedora-37-tests-prebuilt-env:
   extends:
     - .integration_tests_prebuilt_env
-    - .fedora-36-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-tests-local-env:
+fedora-37-tests-local-env:
   extends:
     - .integration_tests_local_env
-    - .fedora-36-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-36-upstream-qemu-tests:
+.fedora-37-upstream-qemu-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-upstream-qemu-tests-prebuilt-env:
   extends:
     - .integration_tests_prebuilt_env
-    - .fedora-36-upstream-qemu-tests
+    - .fedora-37-upstream-qemu-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-upstream-qemu-tests-local-env:
   extends:
     - .integration_tests_local_env
-    - .fedora-36-upstream-qemu-tests
+    - .fedora-37-upstream-qemu-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

diff --git a/ci/manifest.yml b/ci/manifest.yml
index 2aec92dd26a5ed6ca3cf279300795508a0494cec..2aa9ce99526372c5a93934b01fda7b0c9cb48f13 100644 (file)
--- a/ci/manifest.yml
+++ b/ci/manifest.yml
@@ -116,7 +116,7 @@ targets:
         containers: false
         builds: false
 
-  fedora-35:
+  fedora-36:
     jobs:
       - arch: x86_64
         artifacts:
@@ -124,7 +124,7 @@ targets:
           paths:
             - libvirt-rpms
 
-  fedora-36:
+  fedora-37:
     jobs:
       - arch: x86_64
         artifacts: