diff options
30 files changed, 99 insertions, 54 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 09c50d2..2adad2d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,7 @@ # the upstream repo default branch. To force a run when pushing # to a feature branch use # -# git push -o ci.variable=RUN_PIPELINEI=1 ... +# git push -o ci.variable=RUN_PIPELINE=1 ... stages: - containers @@ -85,6 +85,7 @@ stages: script: - source <(_venv_/bin/python3 bin/lcitool -d /tmp/datadir variables $NAME all_mappings | grep PKGS) - set +e + - ret=0 - for pkg in $PKGS; do echo -n "Checking package '$pkg' ... "; @@ -97,7 +98,7 @@ stages: echo "LAST ERROR:"; echo "-----------"; echo -e "$out"; - exit 1; + ret=1; fi; done @@ -113,7 +114,7 @@ stages: echo "LAST ERROR:"; echo "-----------"; echo -e "$out"; - exit 1; + ret=1; fi; done @@ -129,9 +130,16 @@ stages: echo "LAST ERROR:"; echo "-----------"; echo -e "$out"; - exit 1; + ret=1; fi; done + + - if [ $ret -ne 0 ]; + then + echo "Some failures occurred. See above"; + exit $ret; + fi; + variables: CPAN_DRY_RUN_COMMAND: cpanm --scandeps rules: @@ -240,19 +248,19 @@ x86_64-check-almalinux-9: IMAGE: docker.io/library/almalinux:9 NAME: almalinux-9 -x86_64-check-alpine-320: +x86_64-check-alpine-321: extends: .check_container_template variables: <<: *apk_dry_run_command - IMAGE: docker.io/library/alpine:3.20 - NAME: alpine-320 + IMAGE: docker.io/library/alpine:3.21 + NAME: alpine-321 -x86_64-check-alpine-321: +x86_64-check-alpine-322: extends: .check_container_template variables: <<: *apk_dry_run_command - IMAGE: docker.io/library/alpine:3.21 - NAME: alpine-321 + IMAGE: docker.io/library/alpine:3.22 + NAME: alpine-322 x86_64-check-alpine-edge: extends: .check_container_template @@ -285,19 +293,19 @@ x86_64-check-debian-sid: IMAGE: docker.io/library/debian:sid-slim NAME: debian-sid -x86_64-check-fedora-40: +x86_64-check-fedora-41: extends: .check_container_template variables: <<: *dnf_dry_run_command - IMAGE: registry.fedoraproject.org/fedora:40 - NAME: fedora-40 + IMAGE: registry.fedoraproject.org/fedora:41 + NAME: fedora-41 -x86_64-check-fedora-41: +x86_64-check-fedora-42: extends: .check_container_template variables: <<: *dnf_dry_run_command - IMAGE: registry.fedoraproject.org/fedora:41 - NAME: fedora-41 + IMAGE: registry.fedoraproject.org/fedora:42 + NAME: fedora-42 x86_64-check-fedora-rawhide: extends: .check_container_template diff --git a/ci/gitlab/all_mappings_prep_env/alpine-320-prep.sh b/ci/gitlab/all_mappings_prep_env/alpine-322-prep.sh index 01c524f..01c524f 120000 --- a/ci/gitlab/all_mappings_prep_env/alpine-320-prep.sh +++ b/ci/gitlab/all_mappings_prep_env/alpine-322-prep.sh diff --git a/ci/gitlab/all_mappings_prep_env/fedora-40-prep.sh b/ci/gitlab/all_mappings_prep_env/fedora-42-prep.sh index 7e22cf7..7e22cf7 120000 --- a/ci/gitlab/all_mappings_prep_env/fedora-40-prep.sh +++ b/ci/gitlab/all_mappings_prep_env/fedora-42-prep.sh diff --git a/containers/cirrus-run/Dockerfile b/containers/cirrus-run/Dockerfile index 78aafcd..9eaca67 100644 --- a/containers/cirrus-run/Dockerfile +++ b/containers/cirrus-run/Dockerfile @@ -4,4 +4,4 @@ COPY cirrus-vars.py /usr/bin/cirrus-vars #RUN pip3 install cirrus-run==1.0.1 RUN apk add git -RUN pip3 install 'cirrus-run @ git+https://github.com/pipo/cirrus-run@job-credits-2' +RUN pip3 install 'cirrus-run @ git+https://gitlab.com/libvirt/cirrus-run@main' diff --git a/examples/manifest.yml b/examples/manifest.yml index 61e3646..fac8c01 100644 --- a/examples/manifest.yml +++ b/examples/manifest.yml @@ -94,10 +94,10 @@ targets: almalinux-9: x86_64 - alpine-320: x86_64 - alpine-321: x86_64 + alpine-322: x86_64 + alpine-edge: jobs: - arch: x86_64 @@ -138,10 +138,10 @@ targets: - arch: ppc64le - arch: s390x - fedora-40: x86_64 - fedora-41: x86_64 + fedora-42: x86_64 + fedora-rawhide: jobs: - arch: x86_64 diff --git a/lcitool/facts/mappings.yml b/lcitool/facts/mappings.yml index f4d6bf5..34810e5 100644 --- a/lcitool/facts/mappings.yml +++ b/lcitool/facts/mappings.yml @@ -161,7 +161,6 @@ mappings: rpm: bash-completion-devel AlmaLinux9: bash-completion CentOSStream9: bash-completion - Fedora40: bash-completion bc: default: bc @@ -353,7 +352,6 @@ mappings: OpenSUSE: systemtap-dtrace AlmaLinux9: systemtap-sdt-devel CentOSStream9: systemtap-sdt-devel - Fedora40: systemtap-sdt-devel OpenSUSELeap15: systemtap-sdt-devel cross-policy-default: foreign @@ -805,6 +803,8 @@ mappings: rpm: libcmpiutil-devel AlmaLinux: CentOS: + OpenSUSE: + OpenSUSELeap15: libcmpiutil-devel libconfig: default: libconfig @@ -1005,6 +1005,12 @@ mappings: apk: ceph-dev deb: librbd-dev rpm: librbd-devel + armv6l-deb: + armv6l-Debian12: librbd-dev + armv7l-deb: + armv7l-Debian12: librbd-dev + i686-deb: + i686-Debian12: librbd-dev cross-policy-default: foreign librdmacm: @@ -1399,10 +1405,12 @@ mappings: MacOS: pcre-static: - apk: pcre-dev + apk: pcre2-dev deb: libpcre2-dev - rpm: pcre-static - OpenSUSE: pcre-devel-static + rpm: pcre2-static + OpenSUSE: pcre2-devel-static + AlmaLinux9: pcre-static + CentOSStream9: pcre-static cross-policy-default: foreign perl: @@ -1725,9 +1733,6 @@ mappings: pkg: py311-gobject3 rpm: python3-gobject - python3-imp: - Fedora40: python3-zombie-imp - python3-libvirt: apk: py3-libvirt deb: python3-libvirt @@ -1762,6 +1767,14 @@ mappings: CentOS: MacOS: + python3-packaging: + apk: py3-packaging + deb: python3-packaging + pkg: py311-packaging + rpm: python3-packaging + MacOS: python-packaging + OpenSUSE: python3-packaging + python3-pillow: default: python3-pillow apk: py3-pillow @@ -1923,8 +1936,11 @@ mappings: default: sdl2 apk: sdl2-dev deb: libsdl2-dev - rpm: SDL2-devel - OpenSUSE: libSDL2-devel + rpm: sdl2-compat-devel + AlmaLinux: SDL2-devel + CentOS: SDL2-devel + Fedora41: SDL2-devel + OpenSUSELeap15: libSDL2-devel cross-mingw32-rpm: mingw32-SDL2 cross-mingw64-rpm: mingw64-SDL2 cross-policy-default: foreign @@ -2175,7 +2191,8 @@ mappings: AlmaLinux: CentOS: aarch64-deb: libxen-dev - armv7l-deb: libxen-dev + armv7l-Debian: + armv7l-Debian12: libxen-dev x86_64-deb: libxen-dev cross-policy-default: foreign diff --git a/lcitool/facts/targets/alpine-320.yml b/lcitool/facts/targets/alpine-322.yml index 0108543..70b0148 100644 --- a/lcitool/facts/targets/alpine-320.yml +++ b/lcitool/facts/targets/alpine-322.yml @@ -1,7 +1,7 @@ --- os: name: 'Alpine' - version: '320' + version: '322' packaging: format: 'apk' @@ -21,4 +21,4 @@ ansible_python_package: python3 ansible_python_interpreter: /usr/bin/python3 containers: - base: docker.io/library/alpine:3.20 + base: docker.io/library/alpine:3.22 diff --git a/lcitool/facts/targets/fedora-40.yml b/lcitool/facts/targets/fedora-42.yml index ac4d01f..aff547f 100644 --- a/lcitool/facts/targets/fedora-40.yml +++ b/lcitool/facts/targets/fedora-42.yml @@ -1,15 +1,15 @@ --- os: name: 'Fedora' - version: '40' - libosinfo_id: 'http://fedoraproject.org/fedora/40' + version: '42' + libosinfo_id: 'http://fedoraproject.org/fedora/42' packaging: format: 'rpm' command: 'dnf' paths: - bash: /bin/bash + bash: /usr/bin/bash cc: /usr/bin/gcc ccache: /usr/bin/ccache make: /usr/bin/make @@ -23,7 +23,7 @@ ansible_python_interpreter: /usr/bin/python3 install: unattended_scheme: kickstart - url: https://download.fedoraproject.org/pub/fedora/linux/releases/40/Everything/x86_64/os + url: https://download.fedoraproject.org/pub/fedora/linux/releases/42/Everything/x86_64/os containers: - base: registry.fedoraproject.org/fedora:40 + base: registry.fedoraproject.org/fedora:42 diff --git a/tests/data/packages/in/packages.yml b/tests/data/packages/in/packages.yml index 91c7fd3..8fef8b9 100644 --- a/tests/data/packages/in/packages.yml +++ b/tests/data/packages/in/packages.yml @@ -261,12 +261,12 @@ packages: - python3-devel - python3-docutils - python3-gobject -- python3-imp - python3-libvirt - python3-libxml2 - python3-lxml - python3-numpy - python3-opencv +- python3-packaging - python3-pillow - python3-pip - python3-pytest diff --git a/tests/data/packages/out/almalinux-9.yml b/tests/data/packages/out/almalinux-9.yml index e324a58..6597a6e 100644 --- a/tests/data/packages/out/almalinux-9.yml +++ b/tests/data/packages/out/almalinux-9.yml @@ -227,6 +227,7 @@ native: - python3-libxml2 - python3-lxml - python3-numpy +- python3-packaging - python3-pillow - python3-pip - python3-pytest diff --git a/tests/data/packages/out/alpine-321.yml b/tests/data/packages/out/alpine-321.yml index 153d587..009a464 100644 --- a/tests/data/packages/out/alpine-321.yml +++ b/tests/data/packages/out/alpine-321.yml @@ -160,7 +160,7 @@ native: - openssh-client - osinfo-db-tools - parted-dev -- pcre-dev +- pcre2-dev - perl - perl-app-cpanminus - perl-dev @@ -195,6 +195,7 @@ native: - py3-libxml2 - py3-lxml - py3-numpy +- py3-packaging - py3-pillow - py3-pip - py3-pytest diff --git a/tests/data/packages/out/alpine-320.yml b/tests/data/packages/out/alpine-322.yml index 153d587..009a464 100644 --- a/tests/data/packages/out/alpine-320.yml +++ b/tests/data/packages/out/alpine-322.yml @@ -160,7 +160,7 @@ native: - openssh-client - osinfo-db-tools - parted-dev -- pcre-dev +- pcre2-dev - perl - perl-app-cpanminus - perl-dev @@ -195,6 +195,7 @@ native: - py3-libxml2 - py3-lxml - py3-numpy +- py3-packaging - py3-pillow - py3-pip - py3-pytest diff --git a/tests/data/packages/out/alpine-edge.yml b/tests/data/packages/out/alpine-edge.yml index 153d587..009a464 100644 --- a/tests/data/packages/out/alpine-edge.yml +++ b/tests/data/packages/out/alpine-edge.yml @@ -160,7 +160,7 @@ native: - openssh-client - osinfo-db-tools - parted-dev -- pcre-dev +- pcre2-dev - perl - perl-app-cpanminus - perl-dev @@ -195,6 +195,7 @@ native: - py3-libxml2 - py3-lxml - py3-numpy +- py3-packaging - py3-pillow - py3-pip - py3-pytest diff --git a/tests/data/packages/out/centos-stream-9.yml b/tests/data/packages/out/centos-stream-9.yml index e324a58..6597a6e 100644 --- a/tests/data/packages/out/centos-stream-9.yml +++ b/tests/data/packages/out/centos-stream-9.yml @@ -227,6 +227,7 @@ native: - python3-libxml2 - python3-lxml - python3-numpy +- python3-packaging - python3-pillow - python3-pip - python3-pytest diff --git a/tests/data/packages/out/debian-12-cross-s390x.yml b/tests/data/packages/out/debian-12-cross-s390x.yml index 45aea9d..490df3f 100644 --- a/tests/data/packages/out/debian-12-cross-s390x.yml +++ b/tests/data/packages/out/debian-12-cross-s390x.yml @@ -257,6 +257,7 @@ native: - python3-lxml - python3-numpy - python3-opencv +- python3-packaging - python3-pillow - python3-pip - python3-pytest diff --git a/tests/data/packages/out/debian-12.yml b/tests/data/packages/out/debian-12.yml index 1479220..c0edd6e 100644 --- a/tests/data/packages/out/debian-12.yml +++ b/tests/data/packages/out/debian-12.yml @@ -255,6 +255,7 @@ native: - python3-lxml - python3-numpy - python3-opencv +- python3-packaging - python3-pillow - python3-pip - python3-pytest diff --git a/tests/data/packages/out/debian-13.yml b/tests/data/packages/out/debian-13.yml index 79146f7..7a1079a 100644 --- a/tests/data/packages/out/debian-13.yml +++ b/tests/data/packages/out/debian-13.yml @@ -255,6 +255,7 @@ native: - python3-lxml - python3-numpy - python3-opencv +- python3-packaging - python3-pillow - python3-pip - python3-pytest diff --git a/tests/data/packages/out/debian-sid.yml b/tests/data/packages/out/debian-sid.yml index 79146f7..7a1079a 100644 --- a/tests/data/packages/out/debian-sid.yml +++ b/tests/data/packages/out/debian-sid.yml @@ -255,6 +255,7 @@ native: - python3-lxml - python3-numpy - python3-opencv +- python3-packaging - python3-pillow - python3-pip - python3-pytest diff --git a/tests/data/packages/out/fedora-41.yml b/tests/data/packages/out/fedora-41.yml index ebf8c58..dd84aca 100644 --- a/tests/data/packages/out/fedora-41.yml +++ b/tests/data/packages/out/fedora-41.yml @@ -181,7 +181,7 @@ native: - osinfo-db-tools - pam-devel - parted-devel -- pcre-static +- pcre2-static - perl-App-cpanminus - perl-Archive-Tar - perl-CPAN-Changes @@ -243,6 +243,7 @@ native: - python3-lxml - python3-numpy - python3-opencv +- python3-packaging - python3-pillow - python3-pip - python3-pytest diff --git a/tests/data/packages/out/fedora-40.yml b/tests/data/packages/out/fedora-42.yml index 2cd21ee..6a68fe3 100644 --- a/tests/data/packages/out/fedora-40.yml +++ b/tests/data/packages/out/fedora-42.yml @@ -1,5 +1,4 @@ native: -- SDL2-devel - SDL2_image-devel - alsa-lib-devel - ant @@ -9,7 +8,7 @@ native: - autoconf - automake - bash -- bash-completion +- bash-completion-devel - bc - bindgen-cli - bison @@ -181,7 +180,7 @@ native: - osinfo-db-tools - pam-devel - parted-devel -- pcre-static +- pcre2-static - perl-App-cpanminus - perl-Archive-Tar - perl-CPAN-Changes @@ -243,6 +242,7 @@ native: - python3-lxml - python3-numpy - python3-opencv +- python3-packaging - python3-pillow - python3-pip - python3-pytest @@ -252,7 +252,6 @@ native: - python3-sphinx_rtd_theme - python3-tomli - python3-wheel -- python3-zombie-imp - qemu-img - qemu-kvm - rdma-core-devel @@ -267,6 +266,7 @@ native: - sanlock-devel - screen - scrub +- sdl2-compat-devel - sed - snappy-devel - socat @@ -280,6 +280,7 @@ native: - systemd-devel - systemd-rpm-macros - systemtap-sdt-devel +- systemtap-sdt-dtrace - tar - tcl-devel - tcpdump diff --git a/tests/data/packages/out/fedora-rawhide-cross-mingw64.yml b/tests/data/packages/out/fedora-rawhide-cross-mingw64.yml index 9aeccc9..7ea4b72 100644 --- a/tests/data/packages/out/fedora-rawhide-cross-mingw64.yml +++ b/tests/data/packages/out/fedora-rawhide-cross-mingw64.yml @@ -191,6 +191,7 @@ native: - python3-lxml - python3-numpy - python3-opencv +- python3-packaging - python3-pillow - python3-pip - python3-pytest diff --git a/tests/data/packages/out/fedora-rawhide.yml b/tests/data/packages/out/fedora-rawhide.yml index ebf8c58..6a68fe3 100644 --- a/tests/data/packages/out/fedora-rawhide.yml +++ b/tests/data/packages/out/fedora-rawhide.yml @@ -1,5 +1,4 @@ native: -- SDL2-devel - SDL2_image-devel - alsa-lib-devel - ant @@ -181,7 +180,7 @@ native: - osinfo-db-tools - pam-devel - parted-devel -- pcre-static +- pcre2-static - perl-App-cpanminus - perl-Archive-Tar - perl-CPAN-Changes @@ -243,6 +242,7 @@ native: - python3-lxml - python3-numpy - python3-opencv +- python3-packaging - python3-pillow - python3-pip - python3-pytest @@ -266,6 +266,7 @@ native: - sanlock-devel - screen - scrub +- sdl2-compat-devel - sed - snappy-devel - socat diff --git a/tests/data/packages/out/freebsd-13.yml b/tests/data/packages/out/freebsd-13.yml index 32f983b..100da1a 100644 --- a/tests/data/packages/out/freebsd-13.yml +++ b/tests/data/packages/out/freebsd-13.yml @@ -148,6 +148,7 @@ native: - py311-libxml2 - py311-lxml - py311-numpy +- py311-packaging - py311-pillow - py311-pip - py311-pytest diff --git a/tests/data/packages/out/freebsd-14.yml b/tests/data/packages/out/freebsd-14.yml index 32f983b..100da1a 100644 --- a/tests/data/packages/out/freebsd-14.yml +++ b/tests/data/packages/out/freebsd-14.yml @@ -148,6 +148,7 @@ native: - py311-libxml2 - py311-lxml - py311-numpy +- py311-packaging - py311-pillow - py311-pip - py311-pytest diff --git a/tests/data/packages/out/freebsd-current.yml b/tests/data/packages/out/freebsd-current.yml index 32f983b..100da1a 100644 --- a/tests/data/packages/out/freebsd-current.yml +++ b/tests/data/packages/out/freebsd-current.yml @@ -148,6 +148,7 @@ native: - py311-libxml2 - py311-lxml - py311-numpy +- py311-packaging - py311-pillow - py311-pip - py311-pytest diff --git a/tests/data/packages/out/macos-14.yml b/tests/data/packages/out/macos-14.yml index 0881e82..c761389 100644 --- a/tests/data/packages/out/macos-14.yml +++ b/tests/data/packages/out/macos-14.yml @@ -124,6 +124,7 @@ native: - pixman - pkg-config - python-build +- python-packaging - python3 - qemu - readline diff --git a/tests/data/packages/out/opensuse-leap-15.yml b/tests/data/packages/out/opensuse-leap-15.yml index 99e0cb4..368453e 100644 --- a/tests/data/packages/out/opensuse-leap-15.yml +++ b/tests/data/packages/out/opensuse-leap-15.yml @@ -184,7 +184,7 @@ native: - osinfo-db-tools - pam-devel - parted-devel -- pcre-devel-static +- pcre2-devel-static - perl - perl-App-cpanminus - perl-Archive-Tar @@ -229,6 +229,7 @@ native: - python3-lxml - python3-numpy - python3-opencv +- python3-packaging - python3-pip - python3-pytest - python3-requests diff --git a/tests/data/packages/out/opensuse-tumbleweed.yml b/tests/data/packages/out/opensuse-tumbleweed.yml index e97a754..850fe14 100644 --- a/tests/data/packages/out/opensuse-tumbleweed.yml +++ b/tests/data/packages/out/opensuse-tumbleweed.yml @@ -87,7 +87,6 @@ native: - json-glib-devel - junit - kmod -- libSDL2-devel - libSDL2_image-devel - libacl-devel - libaio-devel @@ -102,7 +101,6 @@ native: - libcap-ng-devel - libcbor-devel - libcmocka-devel -- libcmpiutil-devel - libconfig-devel - libcurl-devel - libdrm-devel @@ -185,7 +183,7 @@ native: - osinfo-db-tools - pam-devel - parted-devel -- pcre-devel-static +- pcre2-devel-static - perl - perl-App-cpanminus - perl-CPAN-Changes @@ -230,6 +228,7 @@ native: - python3-lxml - python3-numpy - python3-opencv +- python3-packaging - python3-pip - python3-pytest - python3-requests @@ -251,6 +250,7 @@ native: - sanlock-devel - screen - scrub +- sdl2-compat-devel - sed - snappy-devel - sndio-devel diff --git a/tests/data/packages/out/ubuntu-2204.yml b/tests/data/packages/out/ubuntu-2204.yml index c223c1c..5e666b5 100644 --- a/tests/data/packages/out/ubuntu-2204.yml +++ b/tests/data/packages/out/ubuntu-2204.yml @@ -251,6 +251,7 @@ native: - python3-lxml - python3-numpy - python3-opencv +- python3-packaging - python3-pillow - python3-pip - python3-pytest diff --git a/tests/data/packages/out/ubuntu-2404.yml b/tests/data/packages/out/ubuntu-2404.yml index 5743215..db88633 100644 --- a/tests/data/packages/out/ubuntu-2404.yml +++ b/tests/data/packages/out/ubuntu-2404.yml @@ -255,6 +255,7 @@ native: - python3-lxml - python3-numpy - python3-opencv +- python3-packaging - python3-pillow - python3-pip - python3-pytest |