diff options
| author | Daniel P. Berrangé <berrange@redhat.com> | 2026-02-09 19:04:49 +0000 |
|---|---|---|
| committer | Daniel P. Berrangé <berrange@redhat.com> | 2026-02-09 20:37:22 +0000 |
| commit | 750455ce1199db7e304a6b4feae5f290283dd52a (patch) | |
| tree | 7c4f88a7dde2fe1fac94e69106185ef5e6873067 | |
| parent | 926282ba763c5a6c2a683281fb22ff3826393566 (diff) | |
| download | libvirt-ci-master.tar.gz libvirt-ci-master.tar.bz2 libvirt-ci-master.zip | |
The Leap 16.0 repos have eliminated a number of packages which
previously existed in 15.6 and also still exist in Tumbleweed.
The CI script must now also use python313-base, not python311-base
as the latter is not available in 16.0 repos. This can be done for
Tumbleweed too.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
| -rw-r--r-- | .gitlab-ci.yml | 7 | ||||
| -rwxr-xr-x[l---------] | ci/gitlab/all_mappings_prep_env/opensuse-leap-15-prep.sh | 9 | ||||
| l--------- | ci/gitlab/all_mappings_prep_env/opensuse-leap-16-prep.sh | 1 | ||||
| -rwxr-xr-x | ci/gitlab/all_mappings_prep_env/opensuse-prep.sh | 6 | ||||
| -rw-r--r-- | lcitool/facts/mappings.yml | 12 | ||||
| -rw-r--r-- | lcitool/facts/targets/opensuse-leap-16.yml | 29 | ||||
| -rw-r--r-- | tests/data/packages/out/opensuse-leap-16.yml | 290 |
7 files changed, 348 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 336fb81d..09aba0dc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -356,6 +356,13 @@ x86_64-check-opensuse-leap-15: IMAGE: registry.opensuse.org/opensuse/leap:15.6 NAME: opensuse-leap-15 +x86_64-check-opensuse-leap-16: + extends: .check_container_template + variables: + <<: *zypper_dry_run_command + IMAGE: registry.opensuse.org/opensuse/leap:16.0 + NAME: opensuse-leap-16 + x86_64-check-opensuse-tumbleweed: extends: .check_container_template allow_failure: true diff --git a/ci/gitlab/all_mappings_prep_env/opensuse-leap-15-prep.sh b/ci/gitlab/all_mappings_prep_env/opensuse-leap-15-prep.sh index 14f1757e..4854179e 120000..100755 --- a/ci/gitlab/all_mappings_prep_env/opensuse-leap-15-prep.sh +++ b/ci/gitlab/all_mappings_prep_env/opensuse-leap-15-prep.sh @@ -1 +1,8 @@ -opensuse-prep.sh
\ No newline at end of file +#!/bin/sh + +zypper dist-upgrade -y +zypper install -y \ + perl-App-cpanminus \ + python311-base \ + python311-pip +test -f /usr/bin/python3 || ln -s /usr/bin/python3.11 /usr/bin/python3 diff --git a/ci/gitlab/all_mappings_prep_env/opensuse-leap-16-prep.sh b/ci/gitlab/all_mappings_prep_env/opensuse-leap-16-prep.sh new file mode 120000 index 00000000..14f1757e --- /dev/null +++ b/ci/gitlab/all_mappings_prep_env/opensuse-leap-16-prep.sh @@ -0,0 +1 @@ +opensuse-prep.sh
\ No newline at end of file diff --git a/ci/gitlab/all_mappings_prep_env/opensuse-prep.sh b/ci/gitlab/all_mappings_prep_env/opensuse-prep.sh index 4854179e..d649a78d 100755 --- a/ci/gitlab/all_mappings_prep_env/opensuse-prep.sh +++ b/ci/gitlab/all_mappings_prep_env/opensuse-prep.sh @@ -3,6 +3,6 @@ zypper dist-upgrade -y zypper install -y \ perl-App-cpanminus \ - python311-base \ - python311-pip -test -f /usr/bin/python3 || ln -s /usr/bin/python3.11 /usr/bin/python3 + python313-base \ + python313-pip +test -f /usr/bin/python3 || ln -s /usr/bin/python3.13 /usr/bin/python3 diff --git a/lcitool/facts/mappings.yml b/lcitool/facts/mappings.yml index 4d5936bd..736d9a5d 100644 --- a/lcitool/facts/mappings.yml +++ b/lcitool/facts/mappings.yml @@ -166,7 +166,6 @@ mappings: default: bc pkg: - # currently OpenSUSE only packages bindgen in Tumbleweed bindgen: default: bindgen apk: rust-bindgen @@ -301,6 +300,7 @@ mappings: Fedora: cppi MacOS: cppi OpenSUSE: cppi + OpenSUSELeap16: ctags: default: ctags @@ -1249,7 +1249,8 @@ mappings: pkg: lua54 rpm: lua-devel MacOS: lua - OpenSUSETumbleweed: lua54-devel + OpenSUSE: lua54-devel + OpenSUSELeap15: lua-devel lvm2: default: lvm2 @@ -1345,6 +1346,7 @@ mappings: deb: ncat rpm: nmap-ncat OpenSUSE: ncat + OpenSUSELeap16: netcf: apk: netcf-dev @@ -1391,6 +1393,7 @@ mappings: apk: pkg: MacOS: + OpenSUSELeap16: ocaml: default: ocaml @@ -1500,6 +1503,7 @@ mappings: deb: libio-interface-perl pkg: p5-IO-Interface rpm: perl-IO-Interface + OpenSUSELeap16: perl-IO-String: apk: perl-io-string @@ -1667,6 +1671,7 @@ mappings: pkg: php74-pecl-imagick Fedora: php-pecl-imagick OpenSUSE: php-imagick + OpenSUSELeap16: pixman: default: pixman @@ -1947,6 +1952,7 @@ mappings: sanlock: deb: libsanlock-dev rpm: sanlock-devel + OpenSUSELeap16: cross-policy-default: foreign screen: @@ -1956,6 +1962,7 @@ mappings: default: scrub apk: pkg: diskscrub + OpenSUSELeap16: sdl2: default: sdl2 @@ -1965,6 +1972,7 @@ mappings: AlmaLinux: SDL2-devel CentOS: SDL2-devel OpenSUSELeap15: libSDL2-devel + OpenSUSELeap16: libSDL2-devel cross-mingw32-rpm: mingw32-SDL2 cross-mingw64-rpm: mingw64-SDL2 cross-policy-default: foreign diff --git a/lcitool/facts/targets/opensuse-leap-16.yml b/lcitool/facts/targets/opensuse-leap-16.yml new file mode 100644 index 00000000..c1f348db --- /dev/null +++ b/lcitool/facts/targets/opensuse-leap-16.yml @@ -0,0 +1,29 @@ +--- +os: + name: 'OpenSUSE' + version: 'Leap16' + libosinfo_id: 'http://opensuse.org/opensuse/16.0' + +packaging: + format: 'rpm' + command: 'zypper' + +paths: + bash: /bin/bash + cc: /usr/bin/gcc + ccache: /usr/bin/ccache + make: /usr/bin/make + ninja: /usr/bin/ninja + pip3: /usr/bin/pip3 + python: /usr/bin/python3 + sudoers: /etc/sudoers + +ansible_python_package: python3 +ansible_python_interpreter: /usr/bin/python3 + +install: + unattended_scheme: autoyast + url: http://download.opensuse.org/distribution/leap/16.0/repo/oss/ + +containers: + base: registry.opensuse.org/opensuse/leap:16.0 diff --git a/tests/data/packages/out/opensuse-leap-16.yml b/tests/data/packages/out/opensuse-leap-16.yml new file mode 100644 index 00000000..c34222c7 --- /dev/null +++ b/tests/data/packages/out/opensuse-leap-16.yml @@ -0,0 +1,290 @@ +cpan: +- IO::Compress::Bzip2 +- IO::Interface +- LWP::UserAgent +- Net::OpenSSH +- TAP::Formatter::HTML +- TAP::Formatter::JUnit +- TAP::Harness::Archive +- accessors +native: +- Mesa-devel +- alsa-lib-devel +- ant +- ant-junit +- audit-devel +- augeas +- augeas-lenses +- autoconf +- automake +- awk +- bash +- bash-completion-devel +- bc +- bison +- brlapi-devel +- bzip2 +- ca-certificates +- cargo +- cargo-c +- cargo-packaging +- ccache +- check-devel +- chrony +- clang +- clang-devel +- cloud-init +- codespell +- coreutils +- cpp +- ctags +- cyrus-sasl-devel +- dbus-1 +- device-mapper-devel +- diffutils +- dnsmasq +- dtc +- dwarves +- e2fsprogs +- ebtables +- expect +- findutils +- flex +- fuse-devel +- fuse3 +- fuse3-devel +- gcc +- gcc-c++ +- gcovr +- gdb +- gdk-pixbuf-devel +- gettext-devel +- gettext-runtime +- git +- glib2-devel +- glibc-devel +- glibc-locale +- glibc-static +- glusterfs-devel +- gnutls +- go +- gobject-introspection-devel +- grep +- gtk-doc +- gtk-vnc-devel +- gtk3-devel +- gtk3-tools +- guestfs-tools +- gzip +- hostname +- hwdata +- icoutils +- intltool +- iproute2 +- iptables +- java-21-openjdk-headless +- jemalloc-devel +- jna +- jq +- json-glib-devel +- junit +- kmod +- libSDL2-devel +- libSDL2_image-devel +- libacl-devel +- libaio-devel +- libapparmor-devel +- libarchive-devel +- libasan8 +- libattr-devel +- libblkid-devel +- libbpf-devel +- libbz2-devel +- libcacard-devel +- libcap-ng-devel +- libcbor-devel +- libcmocka-devel +- libconfig-devel +- libcurl-devel +- libdrm-devel +- libepoxy-devel +- libev-devel +- libfdt-devel +- libffi-devel +- libgcrypt-devel +- libgnutls-devel +- libgovirt-devel +- libguestfs-devel +- libiscsi-devel +- libjpeg8-devel +- libjson-c-devel +- libnbd-devel +- libndctl-devel +- libnettle-devel +- libnfs-devel +- libnl3-devel +- libnuma-devel +- libpcap-devel +- libpciaccess-devel +- libpixman-1-0-devel +- libpmem-devel +- libpng16-devel +- libpulse-devel +- librbd-devel +- librest-devel +- libseccomp-devel +- libselinux-devel +- libslirp-devel +- libsoup-devel +- libspice-server-devel +- libssh-devel +- libssh2-devel +- libtasn1-devel +- libtirpc-devel +- libtool +- libtorrent-devel +- libubsan1 +- libudev-devel +- liburing-devel +- libusb-1_0-devel +- libuuid-devel +- libvirt-devel +- libvirt-glib-devel +- libwsman-devel +- libxdp-devel +- libxml2 +- libxml2-devel +- libxslt +- libxslt-devel +- libyajl-devel +- libzstd-devel +- llvm +- lsof +- lttng-ust-devel +- lua54-devel +- lvm2 +- lzo-devel +- make +- meson +- mkisofs +- mtools +- nano +- nbd +- nbdkit +- ncurses-devel +- net-snmp-devel +- net-tools +- nfs-utils +- ninja +- ocaml +- ocaml-findlib +- ocaml-ocamldoc +- open-iscsi +- openssh +- osinfo-db-tools +- pam-devel +- parted-devel +- pcre2-devel-static +- perl +- perl-App-cpanminus +- perl-CPAN-Changes +- perl-Digest +- perl-Digest-MD5 +- perl-File-Slurp +- perl-IO-String +- perl-Module-Build +- perl-Net-SNMP +- perl-NetAddr-IP +- perl-Sub-Uplevel +- perl-Test-Exception +- perl-Test-Pod +- perl-Test-Pod-Coverage +- perl-Test-Simple +- perl-XML-Twig +- perl-XML-Writer +- perl-XML-XPath +- perl-YAML +- perl-base +- php-devel +- pipewire-devel +- pkgconfig +- polkit +- python3-Pillow +- python3-PyYAML +- python3-Sphinx +- python3-base +- python3-black +- python3-boto3 +- python3-build +- python3-dbus-python +- python3-devel +- python3-docutils +- python3-flake8 +- python3-gobject +- python3-libnbd +- python3-libvirt-python +- python3-libxml2 +- python3-lxml +- python3-numpy +- python3-opencv +- python3-packaging +- python3-pip +- python3-pytest +- python3-requests +- python3-selinux +- python3-setuptools +- python3-sphinx_rtd_theme +- python3-tomli +- python3-wheel +- qemu +- qemu-tools +- rdma-core-devel +- readline-devel +- rpcgen +- rpm-build +- ruby +- ruby-devel +- rust +- rust-bindgen +- screen +- sed +- snappy-devel +- sndio-devel +- socat +- sparse +- spice-gtk-devel +- spice-protocol-devel +- strace +- sudo +- swtpm +- systemd-devel +- systemd-rpm-macros +- systemtap-dtrace +- systemtap-headers +- tar +- tcl-devel +- tcpdump +- tesseract-ocr +- tesseract-ocr-traineddata-english +- texinfo +- unzip +- usbredir-devel +- util-linux +- vala +- valgrind +- vim +- virglrenderer-devel +- vte-devel +- vulkan-tools +- wget +- which +- wireshark-devel +- xen-devel +- xfsprogs-devel +- xorriso +- xz +- xz-devel +- zip +- zlib-devel +- zlib-devel-static +- zstd |
