diff --git a/ci/buildenv/almalinux-8.sh b/ci/buildenv/almalinux-8.sh deleted file mode 100644 index b56f24e..0000000 --- a/ci/buildenv/almalinux-8.sh +++ /dev/null @@ -1,47 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool manifest ci/manifest.yml -# -# https://gitlab.com/libvirt/libvirt-ci - -function install_buildenv() { - dnf update -y - dnf install 'dnf-command(config-manager)' -y - dnf config-manager --set-enabled -y powertools - dnf install -y centos-release-advanced-virtualization - dnf install -y epel-release - dnf install -y \ - bash-completion \ - ca-certificates \ - ccache \ - gcc \ - gettext \ - git \ - glib2-devel \ - glibc-devel \ - glibc-langpack-en \ - gtk-vnc2-devel \ - gtk3-devel \ - icoutils \ - libtool \ - libvirt-devel \ - libvirt-gobject-devel \ - libxml2 \ - libxml2-devel \ - make \ - meson \ - ninja-build \ - pkgconfig \ - rpm-build \ - spice-gtk3-devel \ - vte291-devel - rpm -qa | sort > /packages.txt - mkdir -p /usr/libexec/ccache-wrappers - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc -} - -export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" -export LANG="en_US.UTF-8" -export MAKE="/usr/bin/make" -export NINJA="/usr/bin/ninja" diff --git a/ci/buildenv/almalinux-9.sh b/ci/buildenv/almalinux-9.sh index 1a68779..36ace70 100644 --- a/ci/buildenv/almalinux-9.sh +++ b/ci/buildenv/almalinux-9.sh @@ -10,20 +10,11 @@ function install_buildenv() { dnf config-manager --set-enabled -y crb dnf install -y epel-release dnf install -y \ - audit-libs-devel \ - augeas \ bash-completion \ ca-certificates \ ccache \ - clang \ cpp \ cyrus-sasl-devel \ - device-mapper-devel \ - diffutils \ - dwarves \ - ebtables \ - firewalld-filesystem \ - fuse-devel \ gcc \ gdk-pixbuf2-devel \ gettext \ @@ -33,78 +24,38 @@ function install_buildenv() { glibc-langpack-en \ gnutls-devel \ gobject-introspection-devel \ - grep \ gtk-doc \ gtk3-devel \ icoutils \ - iproute \ - iproute-tc \ - iptables \ - iscsi-initiator-utils \ - kmod \ - libacl-devel \ - libattr-devel \ - libblkid-devel \ - libcap-ng-devel \ - libcurl-devel \ libgcrypt-devel \ - libiscsi-devel \ - libnbd-devel \ libnl3-devel \ - libpcap-devel \ - libpciaccess-devel \ - librbd-devel \ - libselinux-devel \ - libssh-devel \ - libssh2-devel \ libtirpc-devel \ libtool \ - libwsman-devel \ libxml2 \ libxml2-devel \ libxslt \ - lvm2 \ make \ meson \ - nfs-utils \ ninja-build \ - numactl-devel \ - numad \ - parted-devel \ perl-base \ pkgconfig \ - polkit \ pulseaudio-libs-devel \ python3 \ python3-docutils \ - python3-flake8 \ - python3-pip \ - python3-pytest \ - python3-setuptools \ - python3-wheel \ - qemu-img \ - readline-devel \ rpm-build \ - sanlock-devel \ - sed \ - systemd-devel \ - systemd-rpm-macros \ - systemtap-sdt-devel \ vala \ - vte291-devel \ - wireshark-devel \ - yajl-devel + vte291-devel rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED rpm -qa | sort > /packages.txt mkdir -p /usr/libexec/ccache-wrappers ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc - /usr/bin/pip3 install black } +function export_buildenv() { export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" export LANG="en_US.UTF-8" export MAKE="/usr/bin/make" export NINJA="/usr/bin/ninja" export PYTHON="/usr/bin/python3" +} diff --git a/ci/buildenv/alpine-319.sh b/ci/buildenv/alpine-319.sh index 43d0515..bb388fb 100644 --- a/ci/buildenv/alpine-319.sh +++ b/ci/buildenv/alpine-319.sh @@ -36,8 +36,10 @@ function install_buildenv() { ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc } +function export_buildenv() { export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" export LANG="en_US.UTF-8" export MAKE="/usr/bin/make" export NINJA="/usr/bin/ninja" +} diff --git a/ci/buildenv/alpine-318.sh b/ci/buildenv/alpine-320.sh similarity index 96% rename from ci/buildenv/alpine-318.sh rename to ci/buildenv/alpine-320.sh index 43d0515..bb388fb 100644 --- a/ci/buildenv/alpine-318.sh +++ b/ci/buildenv/alpine-320.sh @@ -36,8 +36,10 @@ function install_buildenv() { ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc } +function export_buildenv() { export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" export LANG="en_US.UTF-8" export MAKE="/usr/bin/make" export NINJA="/usr/bin/ninja" +} diff --git a/ci/buildenv/alpine-edge.sh b/ci/buildenv/alpine-edge.sh index 43d0515..bb388fb 100644 --- a/ci/buildenv/alpine-edge.sh +++ b/ci/buildenv/alpine-edge.sh @@ -36,8 +36,10 @@ function install_buildenv() { ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc } +function export_buildenv() { export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" export LANG="en_US.UTF-8" export MAKE="/usr/bin/make" export NINJA="/usr/bin/ninja" +} diff --git a/ci/buildenv/centos-stream-9.sh b/ci/buildenv/centos-stream-9.sh index 94326db..e52e48a 100644 --- a/ci/buildenv/centos-stream-9.sh +++ b/ci/buildenv/centos-stream-9.sh @@ -11,20 +11,11 @@ function install_buildenv() { dnf install -y epel-release dnf install -y epel-next-release dnf install -y \ - audit-libs-devel \ - augeas \ bash-completion \ ca-certificates \ ccache \ - clang \ cpp \ cyrus-sasl-devel \ - device-mapper-devel \ - diffutils \ - dwarves \ - ebtables \ - firewalld-filesystem \ - fuse-devel \ gcc \ gdk-pixbuf2-devel \ gettext \ @@ -34,78 +25,38 @@ function install_buildenv() { glibc-langpack-en \ gnutls-devel \ gobject-introspection-devel \ - grep \ gtk-doc \ gtk3-devel \ icoutils \ - iproute \ - iproute-tc \ - iptables \ - iscsi-initiator-utils \ - kmod \ - libacl-devel \ - libattr-devel \ - libblkid-devel \ - libcap-ng-devel \ - libcurl-devel \ libgcrypt-devel \ - libiscsi-devel \ - libnbd-devel \ libnl3-devel \ - libpcap-devel \ - libpciaccess-devel \ - librbd-devel \ - libselinux-devel \ - libssh-devel \ - libssh2-devel \ libtirpc-devel \ libtool \ - libwsman-devel \ libxml2 \ libxml2-devel \ libxslt \ - lvm2 \ make \ meson \ - nfs-utils \ ninja-build \ - numactl-devel \ - numad \ - parted-devel \ perl-base \ pkgconfig \ - polkit \ pulseaudio-libs-devel \ python3 \ python3-docutils \ - python3-flake8 \ - python3-pip \ - python3-pytest \ - python3-setuptools \ - python3-wheel \ - qemu-img \ - readline-devel \ rpm-build \ - sanlock-devel \ - sed \ - systemd-devel \ - systemd-rpm-macros \ - systemtap-sdt-devel \ vala \ - vte291-devel \ - wireshark-devel \ - yajl-devel + vte291-devel rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED rpm -qa | sort > /packages.txt mkdir -p /usr/libexec/ccache-wrappers ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc - /usr/bin/pip3 install black } +function export_buildenv() { export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" export LANG="en_US.UTF-8" export MAKE="/usr/bin/make" export NINJA="/usr/bin/ninja" export PYTHON="/usr/bin/python3" +} diff --git a/ci/buildenv/debian-11.sh b/ci/buildenv/debian-11.sh index 92fac31..78eae08 100644 --- a/ci/buildenv/debian-11.sh +++ b/ci/buildenv/debian-11.sh @@ -42,8 +42,10 @@ function install_buildenv() { ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc } +function export_buildenv() { export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" export LANG="en_US.UTF-8" export MAKE="/usr/bin/make" export NINJA="/usr/bin/ninja" +} diff --git a/ci/buildenv/debian-12.sh b/ci/buildenv/debian-12.sh index 92fac31..78eae08 100644 --- a/ci/buildenv/debian-12.sh +++ b/ci/buildenv/debian-12.sh @@ -42,8 +42,10 @@ function install_buildenv() { ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc } +function export_buildenv() { export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" export LANG="en_US.UTF-8" export MAKE="/usr/bin/make" export NINJA="/usr/bin/ninja" +} diff --git a/ci/buildenv/debian-sid.sh b/ci/buildenv/debian-sid.sh index 92fac31..78eae08 100644 --- a/ci/buildenv/debian-sid.sh +++ b/ci/buildenv/debian-sid.sh @@ -42,8 +42,10 @@ function install_buildenv() { ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc } +function export_buildenv() { export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" export LANG="en_US.UTF-8" export MAKE="/usr/bin/make" export NINJA="/usr/bin/ninja" +} diff --git a/ci/buildenv/fedora-39.sh b/ci/buildenv/fedora-39.sh index b62add2..80d9395 100644 --- a/ci/buildenv/fedora-39.sh +++ b/ci/buildenv/fedora-39.sh @@ -39,8 +39,10 @@ function install_buildenv() { ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc } +function export_buildenv() { export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" export LANG="en_US.UTF-8" export MAKE="/usr/bin/make" export NINJA="/usr/bin/ninja" +} diff --git a/ci/buildenv/fedora-40.sh b/ci/buildenv/fedora-40.sh index b62add2..80d9395 100644 --- a/ci/buildenv/fedora-40.sh +++ b/ci/buildenv/fedora-40.sh @@ -39,8 +39,10 @@ function install_buildenv() { ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc } +function export_buildenv() { export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" export LANG="en_US.UTF-8" export MAKE="/usr/bin/make" export NINJA="/usr/bin/ninja" +} diff --git a/ci/buildenv/fedora-rawhide-cross-mingw32.sh b/ci/buildenv/fedora-rawhide-cross-mingw32.sh index 9282038..3f68ed3 100644 --- a/ci/buildenv/fedora-rawhide-cross-mingw32.sh +++ b/ci/buildenv/fedora-rawhide-cross-mingw32.sh @@ -41,6 +41,7 @@ function install_buildenv() { ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-cc ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-gcc } +function export_buildenv() { export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" export LANG="en_US.UTF-8" @@ -49,3 +50,4 @@ export NINJA="/usr/bin/ninja" export ABI="i686-w64-mingw32" export MESON_OPTS="--cross-file=/usr/share/mingw/toolchain-mingw32.meson" +} diff --git a/ci/buildenv/fedora-rawhide-cross-mingw64.sh b/ci/buildenv/fedora-rawhide-cross-mingw64.sh index 823e14f..b90cebd 100644 --- a/ci/buildenv/fedora-rawhide-cross-mingw64.sh +++ b/ci/buildenv/fedora-rawhide-cross-mingw64.sh @@ -41,6 +41,7 @@ function install_buildenv() { ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-cc ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-gcc } +function export_buildenv() { export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" export LANG="en_US.UTF-8" @@ -49,3 +50,4 @@ export NINJA="/usr/bin/ninja" export ABI="x86_64-w64-mingw32" export MESON_OPTS="--cross-file=/usr/share/mingw/toolchain-mingw64.meson" +} diff --git a/ci/buildenv/fedora-rawhide.sh b/ci/buildenv/fedora-rawhide.sh index 426a412..df5bdcc 100644 --- a/ci/buildenv/fedora-rawhide.sh +++ b/ci/buildenv/fedora-rawhide.sh @@ -40,8 +40,10 @@ function install_buildenv() { ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc } +function export_buildenv() { export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" export LANG="en_US.UTF-8" export MAKE="/usr/bin/make" export NINJA="/usr/bin/ninja" +} diff --git a/ci/buildenv/opensuse-leap-15.sh b/ci/buildenv/opensuse-leap-15.sh index 5969649..605754d 100644 --- 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 \ bash-completion-devel \ ca-certificates \ @@ -39,8 +40,10 @@ function install_buildenv() { ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc } +function export_buildenv() { export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" export LANG="en_US.UTF-8" export MAKE="/usr/bin/make" export NINJA="/usr/bin/ninja" +} diff --git a/ci/buildenv/opensuse-tumbleweed.sh b/ci/buildenv/opensuse-tumbleweed.sh index 6bfd3c6..14ce8e1 100644 --- a/ci/buildenv/opensuse-tumbleweed.sh +++ b/ci/buildenv/opensuse-tumbleweed.sh @@ -39,8 +39,10 @@ function install_buildenv() { ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc } +function export_buildenv() { export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" export LANG="en_US.UTF-8" export MAKE="/usr/bin/make" export NINJA="/usr/bin/ninja" +} diff --git a/ci/buildenv/ubuntu-2204.sh b/ci/buildenv/ubuntu-2204.sh index 843f318..5d19ab4 100644 --- a/ci/buildenv/ubuntu-2204.sh +++ b/ci/buildenv/ubuntu-2204.sh @@ -41,8 +41,10 @@ function install_buildenv() { ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc } +function export_buildenv() { export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" export LANG="en_US.UTF-8" export MAKE="/usr/bin/make" export NINJA="/usr/bin/ninja" +} diff --git a/ci/buildenv/ubuntu-2404.sh b/ci/buildenv/ubuntu-2404.sh index 843f318..5d19ab4 100644 --- a/ci/buildenv/ubuntu-2404.sh +++ b/ci/buildenv/ubuntu-2404.sh @@ -41,8 +41,10 @@ function install_buildenv() { ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc } +function export_buildenv() { export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" export LANG="en_US.UTF-8" export MAKE="/usr/bin/make" export NINJA="/usr/bin/ninja" +} diff --git a/ci/containers/almalinux-8.Dockerfile b/ci/containers/almalinux-8.Dockerfile deleted file mode 100644 index fd7785d..0000000 --- a/ci/containers/almalinux-8.Dockerfile +++ /dev/null @@ -1,49 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool manifest ci/manifest.yml -# -# https://gitlab.com/libvirt/libvirt-ci - -FROM docker.io/library/almalinux:8 - -RUN dnf update -y && \ - dnf install 'dnf-command(config-manager)' -y && \ - dnf config-manager --set-enabled -y powertools && \ - dnf install -y centos-release-advanced-virtualization && \ - dnf install -y epel-release && \ - dnf install -y \ - bash-completion \ - ca-certificates \ - ccache \ - gcc \ - gettext \ - git \ - glib2-devel \ - glibc-devel \ - glibc-langpack-en \ - gtk-vnc2-devel \ - gtk3-devel \ - icoutils \ - libtool \ - libvirt-devel \ - libvirt-gobject-devel \ - libxml2 \ - libxml2-devel \ - make \ - meson \ - ninja-build \ - pkgconfig \ - rpm-build \ - spice-gtk3-devel \ - vte291-devel && \ - dnf autoremove -y && \ - dnf clean all -y && \ - rpm -qa | sort > /packages.txt && \ - mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc - -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" diff --git a/ci/containers/almalinux-9.Dockerfile b/ci/containers/almalinux-9.Dockerfile index 242eed6..056b0c9 100644 --- a/ci/containers/almalinux-9.Dockerfile +++ b/ci/containers/almalinux-9.Dockerfile @@ -11,20 +11,11 @@ RUN dnf update -y && \ dnf config-manager --set-enabled -y crb && \ dnf install -y epel-release && \ dnf install -y \ - audit-libs-devel \ - augeas \ bash-completion \ ca-certificates \ ccache \ - clang \ cpp \ cyrus-sasl-devel \ - device-mapper-devel \ - diffutils \ - dwarves \ - ebtables \ - firewalld-filesystem \ - fuse-devel \ gcc \ gdk-pixbuf2-devel \ gettext \ @@ -34,78 +25,35 @@ RUN dnf update -y && \ glibc-langpack-en \ gnutls-devel \ gobject-introspection-devel \ - grep \ gtk-doc \ gtk3-devel \ icoutils \ - iproute \ - iproute-tc \ - iptables \ - iscsi-initiator-utils \ - kmod \ - libacl-devel \ - libattr-devel \ - libblkid-devel \ - libcap-ng-devel \ - libcurl-devel \ libgcrypt-devel \ - libiscsi-devel \ - libnbd-devel \ libnl3-devel \ - libpcap-devel \ - libpciaccess-devel \ - librbd-devel \ - libselinux-devel \ - libssh-devel \ - libssh2-devel \ libtirpc-devel \ libtool \ - libwsman-devel \ libxml2 \ libxml2-devel \ libxslt \ - lvm2 \ make \ meson \ - nfs-utils \ ninja-build \ - numactl-devel \ - numad \ - parted-devel \ perl-base \ pkgconfig \ - polkit \ pulseaudio-libs-devel \ python3 \ python3-docutils \ - python3-flake8 \ - python3-pip \ - python3-pytest \ - python3-setuptools \ - python3-wheel \ - qemu-img \ - readline-devel \ rpm-build \ - sanlock-devel \ - sed \ - systemd-devel \ - systemd-rpm-macros \ - systemtap-sdt-devel \ vala \ - vte291-devel \ - wireshark-devel \ - yajl-devel && \ + vte291-devel && \ dnf autoremove -y && \ dnf clean all -y && \ rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED && \ rpm -qa | sort > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc -RUN /usr/bin/pip3 install black - ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/alpine-318.Dockerfile b/ci/containers/alpine-320.Dockerfile similarity index 96% rename from ci/containers/alpine-318.Dockerfile rename to ci/containers/alpine-320.Dockerfile index 666c1eb..306f13e 100644 --- a/ci/containers/alpine-318.Dockerfile +++ b/ci/containers/alpine-320.Dockerfile @@ -4,7 +4,7 @@ # # https://gitlab.com/libvirt/libvirt-ci -FROM docker.io/library/alpine:3.18 +FROM docker.io/library/alpine:3.20 RUN apk update && \ apk upgrade && \ diff --git a/ci/containers/centos-stream-9.Dockerfile b/ci/containers/centos-stream-9.Dockerfile index 4a929c7..a40ffe6 100644 --- a/ci/containers/centos-stream-9.Dockerfile +++ b/ci/containers/centos-stream-9.Dockerfile @@ -12,20 +12,11 @@ RUN dnf distro-sync -y && \ dnf install -y epel-release && \ dnf install -y epel-next-release && \ dnf install -y \ - audit-libs-devel \ - augeas \ bash-completion \ ca-certificates \ ccache \ - clang \ cpp \ cyrus-sasl-devel \ - device-mapper-devel \ - diffutils \ - dwarves \ - ebtables \ - firewalld-filesystem \ - fuse-devel \ gcc \ gdk-pixbuf2-devel \ gettext \ @@ -35,78 +26,35 @@ RUN dnf distro-sync -y && \ glibc-langpack-en \ gnutls-devel \ gobject-introspection-devel \ - grep \ gtk-doc \ gtk3-devel \ icoutils \ - iproute \ - iproute-tc \ - iptables \ - iscsi-initiator-utils \ - kmod \ - libacl-devel \ - libattr-devel \ - libblkid-devel \ - libcap-ng-devel \ - libcurl-devel \ libgcrypt-devel \ - libiscsi-devel \ - libnbd-devel \ libnl3-devel \ - libpcap-devel \ - libpciaccess-devel \ - librbd-devel \ - libselinux-devel \ - libssh-devel \ - libssh2-devel \ libtirpc-devel \ libtool \ - libwsman-devel \ libxml2 \ libxml2-devel \ libxslt \ - lvm2 \ make \ meson \ - nfs-utils \ ninja-build \ - numactl-devel \ - numad \ - parted-devel \ perl-base \ pkgconfig \ - polkit \ pulseaudio-libs-devel \ python3 \ python3-docutils \ - python3-flake8 \ - python3-pip \ - python3-pytest \ - python3-setuptools \ - python3-wheel \ - qemu-img \ - readline-devel \ rpm-build \ - sanlock-devel \ - sed \ - systemd-devel \ - systemd-rpm-macros \ - systemtap-sdt-devel \ vala \ - vte291-devel \ - wireshark-devel \ - yajl-devel && \ + vte291-devel && \ dnf autoremove -y && \ dnf clean all -y && \ rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED && \ rpm -qa | sort > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc -RUN /usr/bin/pip3 install black - ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/opensuse-leap-15.Dockerfile b/ci/containers/opensuse-leap-15.Dockerfile index 714db11..9070430 100644 --- a/ci/containers/opensuse-leap-15.Dockerfile +++ b/ci/containers/opensuse-leap-15.Dockerfile @@ -4,9 +4,10 @@ # # https://gitlab.com/libvirt/libvirt-ci -FROM registry.opensuse.org/opensuse/leap:15.5 +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 \ bash-completion-devel \ ca-certificates \ diff --git a/ci/gitlab/build-templates.yml b/ci/gitlab/build-templates.yml index c39edd8..44f3b75 100644 --- a/ci/gitlab/build-templates.yml +++ b/ci/gitlab/build-templates.yml @@ -32,6 +32,7 @@ then source ci/buildenv/$NAME.sh ; install_buildenv ; + export_buildenv ; fi - cat /packages.txt variables: @@ -168,6 +169,7 @@ then source ci/buildenv/$NAME-cross-$CROSS.sh ; install_buildenv ; + export_buildenv ; fi - cat /packages.txt variables: diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml index 1144d80..b2995d5 100644 --- a/ci/gitlab/builds.yml +++ b/ci/gitlab/builds.yml @@ -7,20 +7,8 @@ # Native build jobs -x86_64-almalinux-8: - extends: .native_build_job - needs: - - job: x86_64-almalinux-8-container - optional: true - allow_failure: false - variables: - NAME: almalinux-8 - RPM: skip - TARGET_BASE_IMAGE: docker.io/library/almalinux:8 - - x86_64-almalinux-9: - extends: .native_build_job + extends: .native_git_build_job needs: - job: x86_64-almalinux-9-container optional: true @@ -31,17 +19,6 @@ x86_64-almalinux-9: TARGET_BASE_IMAGE: docker.io/library/almalinux:9 -x86_64-alpine-318: - extends: .native_build_job - needs: - - job: x86_64-alpine-318-container - optional: true - allow_failure: false - variables: - NAME: alpine-318 - TARGET_BASE_IMAGE: docker.io/library/alpine:3.18 - - x86_64-alpine-319: extends: .native_build_job needs: @@ -53,6 +30,17 @@ x86_64-alpine-319: TARGET_BASE_IMAGE: docker.io/library/alpine:3.19 +x86_64-alpine-320: + extends: .native_build_job + needs: + - job: x86_64-alpine-320-container + optional: true + allow_failure: false + variables: + NAME: alpine-320 + TARGET_BASE_IMAGE: docker.io/library/alpine:3.20 + + x86_64-alpine-edge: extends: .native_build_job needs: @@ -65,7 +53,7 @@ x86_64-alpine-edge: x86_64-centos-stream-9: - extends: .native_build_job + extends: .native_git_build_job needs: - job: x86_64-centos-stream-9-container optional: true @@ -151,7 +139,7 @@ x86_64-opensuse-leap-15: variables: NAME: opensuse-leap-15 RPM: skip - TARGET_BASE_IMAGE: registry.opensuse.org/opensuse/leap:15.5 + TARGET_BASE_IMAGE: registry.opensuse.org/opensuse/leap:15.6 x86_64-opensuse-tumbleweed: diff --git a/ci/gitlab/containers.yml b/ci/gitlab/containers.yml index a7b1e36..c75c64c 100644 --- a/ci/gitlab/containers.yml +++ b/ci/gitlab/containers.yml @@ -7,13 +7,6 @@ # Native container jobs -x86_64-almalinux-8-container: - extends: .container_job - allow_failure: false - variables: - NAME: almalinux-8 - - x86_64-almalinux-9-container: extends: .container_job allow_failure: false @@ -21,13 +14,6 @@ x86_64-almalinux-9-container: NAME: almalinux-9 -x86_64-alpine-318-container: - extends: .container_job - allow_failure: false - variables: - NAME: alpine-318 - - x86_64-alpine-319-container: extends: .container_job allow_failure: false @@ -35,6 +21,13 @@ x86_64-alpine-319-container: NAME: alpine-319 +x86_64-alpine-320-container: + extends: .container_job + allow_failure: false + variables: + NAME: alpine-320 + + x86_64-alpine-edge-container: extends: .container_job allow_failure: true diff --git a/ci/manifest.yml b/ci/manifest.yml index 9df958a..35203a2 100644 --- a/ci/manifest.yml +++ b/ci/manifest.yml @@ -9,39 +9,35 @@ gitlab: project: virt-viewer targets: - almalinux-8: - jobs: - - arch: x86_64 - variables: - RPM: skip - almalinux-9: projects: - virt-viewer - - https://gitlab.com/libvirt/libvirt/-/raw/master/ci/lcitool/projects/libvirt.yml + - https://gitlab.com/libvirt/libvirt/-/raw/master/ci/lcitool/projects/libvirt+minimal.yml - https://gitlab.com/libvirt/libvirt-glib/-/raw/master/ci/lcitool/projects/libvirt-glib.yml - https://gitlab.gnome.org/GNOME/gtk-vnc/-/raw/master/ci/lcitool/projects/gtk-vnc.yml jobs: - arch: x86_64 + template: .native_git_build_job variables: RPM: skip - alpine-318: x86_64 - alpine-319: x86_64 + alpine-320: x86_64 + alpine-edge: x86_64 centos-stream-9: projects: - virt-viewer - - https://gitlab.com/libvirt/libvirt/-/raw/master/ci/lcitool/projects/libvirt.yml + - https://gitlab.com/libvirt/libvirt/-/raw/master/ci/lcitool/projects/libvirt+minimal.yml - https://gitlab.com/libvirt/libvirt-glib/-/raw/master/ci/lcitool/projects/libvirt-glib.yml - https://gitlab.gnome.org/GNOME/gtk-vnc/-/raw/master/ci/lcitool/projects/gtk-vnc.yml jobs: - arch: x86_64 + template: .native_git_build_job variables: RPM: skip