ci: refresh with 'lcitool manifest'

Major changes: * macOS 13 is removed. Cirrus CI now only supports a single version, macOS 14, so there is no addition of macOS 15 possible. * The polkit lcitool mapping is renamed to pkcheck * The polkit package is renamed on Debian & Ubuntu Reviewed-by: Peter Krempa <pkrempa@redhat.com> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2024-12-22 05:35:25 +00:00 · 2024-10-16 11:24:38 +01:00 · 2024-10-16 11:24:38 +01:00 · 5148f64a3c
commit 5148f64a3c
parent e937929c16
44 changed files with 42 additions and 79 deletions
--- a/ci/buildenv/debian-12-cross-aarch64.sh
+++ b/ci/buildenv/debian-12-cross-aarch64.sh
@ -40,7 +40,7 @@ function install_buildenv() {
            open-iscsi \
            perl-base \
            pkgconf \
-            policykit-1 \
+            polkitd \
            python3 \
            python3-docutils \
            python3-pytest \
--- a/ci/buildenv/debian-12-cross-armv6l.sh
+++ b/ci/buildenv/debian-12-cross-armv6l.sh
@ -40,7 +40,7 @@ function install_buildenv() {
            open-iscsi \
            perl-base \
            pkgconf \
-            policykit-1 \
+            polkitd \
            python3 \
            python3-docutils \
            python3-pytest \
--- a/ci/buildenv/debian-12-cross-armv7l.sh
+++ b/ci/buildenv/debian-12-cross-armv7l.sh
@ -40,7 +40,7 @@ function install_buildenv() {
            open-iscsi \
            perl-base \
            pkgconf \
-            policykit-1 \
+            polkitd \
            python3 \
            python3-docutils \
            python3-pytest \
--- a/ci/buildenv/debian-12-cross-i686.sh
+++ b/ci/buildenv/debian-12-cross-i686.sh
@ -40,7 +40,7 @@ function install_buildenv() {
            open-iscsi \
            perl-base \
            pkgconf \
-            policykit-1 \
+            polkitd \
            python3 \
            python3-docutils \
            python3-pytest \
--- a/ci/buildenv/debian-12-cross-mips64el.sh
+++ b/ci/buildenv/debian-12-cross-mips64el.sh
@ -40,7 +40,7 @@ function install_buildenv() {
            open-iscsi \
            perl-base \
            pkgconf \
-            policykit-1 \
+            polkitd \
            python3 \
            python3-docutils \
            python3-pytest \
--- a/ci/buildenv/debian-12-cross-mipsel.sh
+++ b/ci/buildenv/debian-12-cross-mipsel.sh
@ -40,7 +40,7 @@ function install_buildenv() {
            open-iscsi \
            perl-base \
            pkgconf \
-            policykit-1 \
+            polkitd \
            python3 \
            python3-docutils \
            python3-pytest \
--- a/ci/buildenv/debian-12-cross-ppc64le.sh
+++ b/ci/buildenv/debian-12-cross-ppc64le.sh
@ -40,7 +40,7 @@ function install_buildenv() {
            open-iscsi \
            perl-base \
            pkgconf \
-            policykit-1 \
+            polkitd \
            python3 \
            python3-docutils \
            python3-pytest \
--- a/ci/buildenv/debian-12-cross-s390x.sh
+++ b/ci/buildenv/debian-12-cross-s390x.sh
@ -40,7 +40,7 @@ function install_buildenv() {
            open-iscsi \
            perl-base \
            pkgconf \
-            policykit-1 \
+            polkitd \
            python3 \
            python3-docutils \
            python3-pytest \
--- a/ci/buildenv/debian-12.sh
+++ b/ci/buildenv/debian-12.sh
@ -74,7 +74,7 @@ function install_buildenv() {
            open-iscsi \
            perl-base \
            pkgconf \
-            policykit-1 \
+            polkitd \
            python3 \
            python3-docutils \
            python3-pytest \
--- a/ci/buildenv/debian-sid-cross-aarch64.sh
+++ b/ci/buildenv/debian-sid-cross-aarch64.sh
@ -40,7 +40,7 @@ function install_buildenv() {
            open-iscsi \
            perl-base \
            pkgconf \
-            policykit-1 \
+            polkitd \
            python3 \
            python3-docutils \
            python3-pytest \
--- a/ci/buildenv/debian-sid-cross-armv6l.sh
+++ b/ci/buildenv/debian-sid-cross-armv6l.sh
@ -40,7 +40,7 @@ function install_buildenv() {
            open-iscsi \
            perl-base \
            pkgconf \
-            policykit-1 \
+            polkitd \
            python3 \
            python3-docutils \
            python3-pytest \
--- a/ci/buildenv/debian-sid-cross-armv7l.sh
+++ b/ci/buildenv/debian-sid-cross-armv7l.sh
@ -40,7 +40,7 @@ function install_buildenv() {
            open-iscsi \
            perl-base \
            pkgconf \
-            policykit-1 \
+            polkitd \
            python3 \
            python3-docutils \
            python3-pytest \
--- a/ci/buildenv/debian-sid-cross-i686.sh
+++ b/ci/buildenv/debian-sid-cross-i686.sh
@ -40,7 +40,7 @@ function install_buildenv() {
            open-iscsi \
            perl-base \
            pkgconf \
-            policykit-1 \
+            polkitd \
            python3 \
            python3-docutils \
            python3-pytest \
--- a/ci/buildenv/debian-sid-cross-mips64el.sh
+++ b/ci/buildenv/debian-sid-cross-mips64el.sh
@ -40,7 +40,7 @@ function install_buildenv() {
            open-iscsi \
            perl-base \
            pkgconf \
-            policykit-1 \
+            polkitd \
            python3 \
            python3-docutils \
            python3-pytest \
--- a/ci/buildenv/debian-sid-cross-ppc64le.sh
+++ b/ci/buildenv/debian-sid-cross-ppc64le.sh
@ -40,7 +40,7 @@ function install_buildenv() {
            open-iscsi \
            perl-base \
            pkgconf \
-            policykit-1 \
+            polkitd \
            python3 \
            python3-docutils \
            python3-pytest \
--- a/ci/buildenv/debian-sid-cross-s390x.sh
+++ b/ci/buildenv/debian-sid-cross-s390x.sh
@ -40,7 +40,7 @@ function install_buildenv() {
            open-iscsi \
            perl-base \
            pkgconf \
-            policykit-1 \
+            polkitd \
            python3 \
            python3-docutils \
            python3-pytest \
--- a/ci/buildenv/debian-sid.sh
+++ b/ci/buildenv/debian-sid.sh
@ -74,7 +74,7 @@ function install_buildenv() {
            open-iscsi \
            perl-base \
            pkgconf \
-            policykit-1 \
+            polkitd \
            python3 \
            python3-docutils \
            python3-pytest \
--- a/ci/buildenv/opensuse-leap-15.sh
+++ b/ci/buildenv/opensuse-leap-15.sh
@ -6,6 +6,7 @@

 function install_buildenv() {
    zypper update -y
+    zypper addrepo -fc https://download.opensuse.org/update/leap/15.6/backports/openSUSE:Backports:SLE-15-SP6:Update.repo
    zypper install -y \
           audit-devel \
           augeas \
--- a/ci/buildenv/ubuntu-2204.sh
+++ b/ci/buildenv/ubuntu-2204.sh
@ -75,7 +75,7 @@ function install_buildenv() {
            open-iscsi \
            perl-base \
            pkgconf \
-            policykit-1 \
+            polkitd \
            python3 \
            python3-docutils \
            python3-pytest \
--- a/ci/buildenv/ubuntu-2404.sh
+++ b/ci/buildenv/ubuntu-2404.sh
@ -75,7 +75,7 @@ function install_buildenv() {
            open-iscsi \
            perl-base \
            pkgconf \
-            policykit-1 \
+            polkitd \
            python3 \
            python3-docutils \
            python3-pytest \
--- a/ci/cirrus/macos-13.vars
+++ b/ci/cirrus/macos-13.vars
@ -1,16 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-CCACHE='/opt/homebrew/bin/ccache'
-CPAN_PKGS=''
-CROSS_PKGS=''
-MAKE='/opt/homebrew/bin/gmake'
-NINJA='/opt/homebrew/bin/ninja'
-PACKAGING_COMMAND='brew'
-PIP3='/opt/homebrew/bin/pip3'
-PKGS='augeas bash-completion black ccache codespell cppi curl diffutils docutils flake8 gettext git glib gnu-sed gnutls grep json-c libiscsi libpcap libssh libssh2 libxml2 libxslt make meson ninja perl pkg-config python3 qemu readline'
-PYPI_PKGS='pytest'
-PYTHON='/opt/homebrew/bin/python3'
--- a/ci/containers/debian-12-cross-aarch64.Dockerfile
+++ b/ci/containers/debian-12-cross-aarch64.Dockerfile
@ -42,7 +42,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      open-iscsi \
                      perl-base \
                      pkgconf \
-                      policykit-1 \
+                      polkitd \
                      python3 \
                      python3-docutils \
                      python3-pytest \
--- a/ci/containers/debian-12-cross-armv6l.Dockerfile
+++ b/ci/containers/debian-12-cross-armv6l.Dockerfile
@ -42,7 +42,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      open-iscsi \
                      perl-base \
                      pkgconf \
-                      policykit-1 \
+                      polkitd \
                      python3 \
                      python3-docutils \
                      python3-pytest \
--- a/ci/containers/debian-12-cross-armv7l.Dockerfile
+++ b/ci/containers/debian-12-cross-armv7l.Dockerfile
@ -42,7 +42,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      open-iscsi \
                      perl-base \
                      pkgconf \
-                      policykit-1 \
+                      polkitd \
                      python3 \
                      python3-docutils \
                      python3-pytest \
--- a/ci/containers/debian-12-cross-i686.Dockerfile
+++ b/ci/containers/debian-12-cross-i686.Dockerfile
@ -42,7 +42,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      open-iscsi \
                      perl-base \
                      pkgconf \
-                      policykit-1 \
+                      polkitd \
                      python3 \
                      python3-docutils \
                      python3-pytest \
--- a/ci/containers/debian-12-cross-mips64el.Dockerfile
+++ b/ci/containers/debian-12-cross-mips64el.Dockerfile
@ -42,7 +42,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      open-iscsi \
                      perl-base \
                      pkgconf \
-                      policykit-1 \
+                      polkitd \
                      python3 \
                      python3-docutils \
                      python3-pytest \
--- a/ci/containers/debian-12-cross-mipsel.Dockerfile
+++ b/ci/containers/debian-12-cross-mipsel.Dockerfile
@ -42,7 +42,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      open-iscsi \
                      perl-base \
                      pkgconf \
-                      policykit-1 \
+                      polkitd \
                      python3 \
                      python3-docutils \
                      python3-pytest \
--- a/ci/containers/debian-12-cross-ppc64le.Dockerfile
+++ b/ci/containers/debian-12-cross-ppc64le.Dockerfile
@ -42,7 +42,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      open-iscsi \
                      perl-base \
                      pkgconf \
-                      policykit-1 \
+                      polkitd \
                      python3 \
                      python3-docutils \
                      python3-pytest \
--- a/ci/containers/debian-12-cross-s390x.Dockerfile
+++ b/ci/containers/debian-12-cross-s390x.Dockerfile
@ -42,7 +42,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      open-iscsi \
                      perl-base \
                      pkgconf \
-                      policykit-1 \
+                      polkitd \
                      python3 \
                      python3-docutils \
                      python3-pytest \
--- a/ci/containers/debian-12.Dockerfile
+++ b/ci/containers/debian-12.Dockerfile
@ -76,7 +76,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      open-iscsi \
                      perl-base \
                      pkgconf \
-                      policykit-1 \
+                      polkitd \
                      python3 \
                      python3-docutils \
                      python3-pytest \
--- a/ci/containers/debian-sid-cross-aarch64.Dockerfile
+++ b/ci/containers/debian-sid-cross-aarch64.Dockerfile
@ -42,7 +42,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      open-iscsi \
                      perl-base \
                      pkgconf \
-                      policykit-1 \
+                      polkitd \
                      python3 \
                      python3-docutils \
                      python3-pytest \
--- a/ci/containers/debian-sid-cross-armv6l.Dockerfile
+++ b/ci/containers/debian-sid-cross-armv6l.Dockerfile
@ -42,7 +42,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      open-iscsi \
                      perl-base \
                      pkgconf \
-                      policykit-1 \
+                      polkitd \
                      python3 \
                      python3-docutils \
                      python3-pytest \
--- a/ci/containers/debian-sid-cross-armv7l.Dockerfile
+++ b/ci/containers/debian-sid-cross-armv7l.Dockerfile
@ -42,7 +42,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      open-iscsi \
                      perl-base \
                      pkgconf \
-                      policykit-1 \
+                      polkitd \
                      python3 \
                      python3-docutils \
                      python3-pytest \
--- a/ci/containers/debian-sid-cross-i686.Dockerfile
+++ b/ci/containers/debian-sid-cross-i686.Dockerfile
@ -42,7 +42,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      open-iscsi \
                      perl-base \
                      pkgconf \
-                      policykit-1 \
+                      polkitd \
                      python3 \
                      python3-docutils \
                      python3-pytest \
--- a/ci/containers/debian-sid-cross-mips64el.Dockerfile
+++ b/ci/containers/debian-sid-cross-mips64el.Dockerfile
@ -42,7 +42,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      open-iscsi \
                      perl-base \
                      pkgconf \
-                      policykit-1 \
+                      polkitd \
                      python3 \
                      python3-docutils \
                      python3-pytest \
--- a/ci/containers/debian-sid-cross-ppc64le.Dockerfile
+++ b/ci/containers/debian-sid-cross-ppc64le.Dockerfile
@ -42,7 +42,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      open-iscsi \
                      perl-base \
                      pkgconf \
-                      policykit-1 \
+                      polkitd \
                      python3 \
                      python3-docutils \
                      python3-pytest \
--- a/ci/containers/debian-sid-cross-s390x.Dockerfile
+++ b/ci/containers/debian-sid-cross-s390x.Dockerfile
@ -42,7 +42,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      open-iscsi \
                      perl-base \
                      pkgconf \
-                      policykit-1 \
+                      polkitd \
                      python3 \
                      python3-docutils \
                      python3-pytest \
--- a/ci/containers/debian-sid.Dockerfile
+++ b/ci/containers/debian-sid.Dockerfile
@ -76,7 +76,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      open-iscsi \
                      perl-base \
                      pkgconf \
-                      policykit-1 \
+                      polkitd \
                      python3 \
                      python3-docutils \
                      python3-pytest \
--- a/ci/containers/opensuse-leap-15.Dockerfile
+++ b/ci/containers/opensuse-leap-15.Dockerfile
@ -7,6 +7,7 @@
 FROM registry.opensuse.org/opensuse/leap:15.6

 RUN zypper update -y && \
+    zypper addrepo -fc https://download.opensuse.org/update/leap/15.6/backports/openSUSE:Backports:SLE-15-SP6:Update.repo && \
    zypper install -y \
           audit-devel \
           augeas \
--- a/ci/containers/ubuntu-2204.Dockerfile
+++ b/ci/containers/ubuntu-2204.Dockerfile
@ -77,7 +77,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      open-iscsi \
                      perl-base \
                      pkgconf \
-                      policykit-1 \
+                      polkitd \
                      python3 \
                      python3-docutils \
                      python3-pytest \
--- a/ci/containers/ubuntu-2404.Dockerfile
+++ b/ci/containers/ubuntu-2404.Dockerfile
@ -77,7 +77,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      open-iscsi \
                      perl-base \
                      pkgconf \
-                      policykit-1 \
+                      polkitd \
                      python3 \
                      python3-docutils \
                      python3-pytest \
--- a/ci/gitlab/builds.yml
+++ b/ci/gitlab/builds.yml
@ -624,28 +624,12 @@ x86_64-freebsd-14:
    UPGRADE_COMMAND: pkg upgrade -y


-aarch64-macos-13:
-  extends: .cirrus_build_job
-  needs: []
-  allow_failure: false
-  variables:
-    CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-ventura-base:latest
-    CIRRUS_VM_IMAGE_SELECTOR: image
-    CIRRUS_VM_INSTANCE_TYPE: macos_instance
-    INSTALL_COMMAND: brew install
-    NAME: macos-13
-    PATH_EXTRA: /usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin:/usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin
-    PKG_CONFIG_PATH: /usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/libpcap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig
-    UPDATE_COMMAND: brew update
-    UPGRADE_COMMAND: brew upgrade
-
-
 aarch64-macos-14:
  extends: .cirrus_build_job
  needs: []
  allow_failure: false
  variables:
-    CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-sonoma-base:latest
+    CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-runner:sonoma
    CIRRUS_VM_IMAGE_SELECTOR: image
    CIRRUS_VM_INSTANCE_TYPE: macos_instance
    INSTALL_COMMAND: brew install
--- a/ci/lcitool/projects/libvirt.yml
+++ b/ci/lcitool/projects/libvirt.yml
@ -63,8 +63,8 @@ packages:
  - numad
  - openwsman
  - perl
+  - pkcheck
  - pkg-config
-  - polkit
  - portablexdr
  - python3
  - python3-docutils
--- a/ci/manifest.yml
+++ b/ci/manifest.yml
@ -203,13 +203,6 @@ targets:
        variables:
          RPM: skip

-  macos-13:
-    jobs:
-      - arch: aarch64
-        variables:
-          PATH_EXTRA: /usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin:/usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin
-          PKG_CONFIG_PATH: /usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/libpcap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig
-
  macos-14:
    jobs:
      - arch: aarch64