diff -Nru osinfo-db-0.20220214/ci/buildenv/centos-stream-8.sh osinfo-db-0.20230518/ci/buildenv/centos-stream-8.sh --- osinfo-db-0.20220214/ci/buildenv/centos-stream-8.sh 1970-01-01 00:00:00.000000000 +0000 +++ osinfo-db-0.20230518/ci/buildenv/centos-stream-8.sh 2023-05-18 12:58:40.000000000 +0000 @@ -0,0 +1,47 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool manifest ci/manifest.yml +# +# https://gitlab.com/libvirt/libvirt-ci + +function install_buildenv() { + dnf distro-sync -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 epel-next-release + dnf install -y \ + ca-certificates \ + ccache \ + gcc \ + gettext \ + git \ + glib2-devel \ + glibc-langpack-en \ + json-glib-devel \ + libarchive-devel \ + libsoup-devel \ + libxml2-devel \ + libxslt-devel \ + make \ + meson \ + ninja-build \ + pkgconfig \ + python3 \ + python3-lxml \ + python3-pytest \ + python3-requests \ + rpm-build \ + xz + 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" +export PYTHON="/usr/bin/python3" diff -Nru osinfo-db-0.20220214/ci/buildenv/centos-stream-9.sh osinfo-db-0.20230518/ci/buildenv/centos-stream-9.sh --- osinfo-db-0.20220214/ci/buildenv/centos-stream-9.sh 1970-01-01 00:00:00.000000000 +0000 +++ osinfo-db-0.20230518/ci/buildenv/centos-stream-9.sh 2023-05-18 12:58:40.000000000 +0000 @@ -0,0 +1,46 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool manifest ci/manifest.yml +# +# https://gitlab.com/libvirt/libvirt-ci + +function install_buildenv() { + dnf distro-sync -y + dnf install 'dnf-command(config-manager)' -y + dnf config-manager --set-enabled -y crb + dnf install -y epel-release + dnf install -y epel-next-release + dnf install -y \ + ca-certificates \ + ccache \ + gcc \ + gettext \ + git \ + glib2-devel \ + glibc-langpack-en \ + json-glib-devel \ + libarchive-devel \ + libsoup-devel \ + libxml2-devel \ + libxslt-devel \ + make \ + meson \ + ninja-build \ + pkgconfig \ + python3 \ + python3-lxml \ + python3-pytest \ + python3-requests \ + rpm-build \ + xz + 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" +export PYTHON="/usr/bin/python3" diff -Nru osinfo-db-0.20220214/ci/buildenv/debian-10.sh osinfo-db-0.20230518/ci/buildenv/debian-10.sh --- osinfo-db-0.20220214/ci/buildenv/debian-10.sh 1970-01-01 00:00:00.000000000 +0000 +++ osinfo-db-0.20230518/ci/buildenv/debian-10.sh 2023-05-18 12:58:40.000000000 +0000 @@ -0,0 +1,48 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool manifest ci/manifest.yml +# +# https://gitlab.com/libvirt/libvirt-ci + +function install_buildenv() { + export DEBIAN_FRONTEND=noninteractive + apt-get update + apt-get dist-upgrade -y + apt-get install --no-install-recommends -y \ + ca-certificates \ + ccache \ + gcc \ + gettext \ + git \ + libarchive-dev \ + libglib2.0-dev \ + libjson-glib-dev \ + libsoup2.4-dev \ + libxml2-dev \ + libxslt1-dev \ + locales \ + make \ + ninja-build \ + pkgconf \ + python3 \ + python3-lxml \ + python3-pip \ + python3-pytest \ + python3-requests \ + python3-setuptools \ + python3-wheel \ + xz-utils + sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen + dpkg-reconfigure locales + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /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 + /usr/bin/pip3 install meson==0.56.0 +} + +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 -Nru osinfo-db-0.20220214/ci/buildenv/debian-11.sh osinfo-db-0.20230518/ci/buildenv/debian-11.sh --- osinfo-db-0.20220214/ci/buildenv/debian-11.sh 1970-01-01 00:00:00.000000000 +0000 +++ osinfo-db-0.20230518/ci/buildenv/debian-11.sh 2023-05-18 12:58:40.000000000 +0000 @@ -0,0 +1,45 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool manifest ci/manifest.yml +# +# https://gitlab.com/libvirt/libvirt-ci + +function install_buildenv() { + export DEBIAN_FRONTEND=noninteractive + apt-get update + apt-get dist-upgrade -y + apt-get install --no-install-recommends -y \ + ca-certificates \ + ccache \ + gcc \ + gettext \ + git \ + libarchive-dev \ + libglib2.0-dev \ + libjson-glib-dev \ + libsoup2.4-dev \ + libxml2-dev \ + libxslt1-dev \ + locales \ + make \ + meson \ + ninja-build \ + pkgconf \ + python3 \ + python3-lxml \ + python3-pytest \ + python3-requests \ + xz-utils + sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen + dpkg-reconfigure locales + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /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" +export PYTHON="/usr/bin/python3" diff -Nru osinfo-db-0.20220214/ci/buildenv/debian-sid.sh osinfo-db-0.20230518/ci/buildenv/debian-sid.sh --- osinfo-db-0.20220214/ci/buildenv/debian-sid.sh 1970-01-01 00:00:00.000000000 +0000 +++ osinfo-db-0.20230518/ci/buildenv/debian-sid.sh 2023-05-18 12:58:40.000000000 +0000 @@ -0,0 +1,45 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool manifest ci/manifest.yml +# +# https://gitlab.com/libvirt/libvirt-ci + +function install_buildenv() { + export DEBIAN_FRONTEND=noninteractive + apt-get update + apt-get dist-upgrade -y + apt-get install --no-install-recommends -y \ + ca-certificates \ + ccache \ + gcc \ + gettext \ + git \ + libarchive-dev \ + libglib2.0-dev \ + libjson-glib-dev \ + libsoup2.4-dev \ + libxml2-dev \ + libxslt1-dev \ + locales \ + make \ + meson \ + ninja-build \ + pkgconf \ + python3 \ + python3-lxml \ + python3-pytest \ + python3-requests \ + xz-utils + sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen + dpkg-reconfigure locales + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /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" +export PYTHON="/usr/bin/python3" diff -Nru osinfo-db-0.20220214/ci/buildenv/fedora-35.sh osinfo-db-0.20230518/ci/buildenv/fedora-35.sh --- osinfo-db-0.20220214/ci/buildenv/fedora-35.sh 1970-01-01 00:00:00.000000000 +0000 +++ osinfo-db-0.20230518/ci/buildenv/fedora-35.sh 2023-05-18 12:58:40.000000000 +0000 @@ -0,0 +1,43 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool manifest ci/manifest.yml +# +# https://gitlab.com/libvirt/libvirt-ci + +function install_buildenv() { + dnf update -y + dnf install -y \ + ca-certificates \ + ccache \ + cppi \ + gcc \ + gettext \ + git \ + glib2-devel \ + glibc-langpack-en \ + json-glib-devel \ + libarchive-devel \ + libsoup-devel \ + libxml2-devel \ + libxslt-devel \ + make \ + meson \ + ninja-build \ + pkgconfig \ + python3 \ + python3-lxml \ + python3-pytest \ + python3-requests \ + rpm-build \ + xz + 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" +export PYTHON="/usr/bin/python3" diff -Nru osinfo-db-0.20220214/ci/buildenv/fedora-36.sh osinfo-db-0.20230518/ci/buildenv/fedora-36.sh --- osinfo-db-0.20220214/ci/buildenv/fedora-36.sh 1970-01-01 00:00:00.000000000 +0000 +++ osinfo-db-0.20230518/ci/buildenv/fedora-36.sh 2023-05-18 12:58:40.000000000 +0000 @@ -0,0 +1,43 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool manifest ci/manifest.yml +# +# https://gitlab.com/libvirt/libvirt-ci + +function install_buildenv() { + dnf update -y + dnf install -y \ + ca-certificates \ + ccache \ + cppi \ + gcc \ + gettext \ + git \ + glib2-devel \ + glibc-langpack-en \ + json-glib-devel \ + libarchive-devel \ + libsoup-devel \ + libxml2-devel \ + libxslt-devel \ + make \ + meson \ + ninja-build \ + pkgconfig \ + python3 \ + python3-lxml \ + python3-pytest \ + python3-requests \ + rpm-build \ + xz + 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" +export PYTHON="/usr/bin/python3" diff -Nru osinfo-db-0.20220214/ci/buildenv/fedora-rawhide.sh osinfo-db-0.20230518/ci/buildenv/fedora-rawhide.sh --- osinfo-db-0.20220214/ci/buildenv/fedora-rawhide.sh 1970-01-01 00:00:00.000000000 +0000 +++ osinfo-db-0.20230518/ci/buildenv/fedora-rawhide.sh 2023-05-18 12:58:40.000000000 +0000 @@ -0,0 +1,44 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool manifest ci/manifest.yml +# +# https://gitlab.com/libvirt/libvirt-ci + +function install_buildenv() { + dnf update -y --nogpgcheck fedora-gpg-keys + dnf distro-sync -y + dnf install -y \ + ca-certificates \ + ccache \ + cppi \ + gcc \ + gettext \ + git \ + glib2-devel \ + glibc-langpack-en \ + json-glib-devel \ + libarchive-devel \ + libsoup-devel \ + libxml2-devel \ + libxslt-devel \ + make \ + meson \ + ninja-build \ + pkgconfig \ + python3 \ + python3-lxml \ + python3-pytest \ + python3-requests \ + rpm-build \ + xz + 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" +export PYTHON="/usr/bin/python3" diff -Nru osinfo-db-0.20220214/ci/buildenv/opensuse-leap-153.sh osinfo-db-0.20230518/ci/buildenv/opensuse-leap-153.sh --- osinfo-db-0.20220214/ci/buildenv/opensuse-leap-153.sh 1970-01-01 00:00:00.000000000 +0000 +++ osinfo-db-0.20230518/ci/buildenv/opensuse-leap-153.sh 2023-05-18 12:58:40.000000000 +0000 @@ -0,0 +1,46 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool manifest ci/manifest.yml +# +# https://gitlab.com/libvirt/libvirt-ci + +function install_buildenv() { + zypper update -y + zypper install -y \ + ca-certificates \ + ccache \ + cppi \ + gcc \ + gettext-runtime \ + git \ + glib2-devel \ + glibc-locale \ + json-glib-devel \ + libarchive-devel \ + libsoup-devel \ + libxml2-devel \ + libxslt-devel \ + make \ + ninja \ + pkgconfig \ + python3-base \ + python3-lxml \ + python3-pip \ + python3-pytest \ + python3-requests \ + python3-setuptools \ + python3-wheel \ + rpm-build \ + xz + 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 + /usr/bin/pip3 install meson==0.56.0 +} + +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 -Nru osinfo-db-0.20220214/ci/buildenv/opensuse-tumbleweed.sh osinfo-db-0.20230518/ci/buildenv/opensuse-tumbleweed.sh --- osinfo-db-0.20220214/ci/buildenv/opensuse-tumbleweed.sh 1970-01-01 00:00:00.000000000 +0000 +++ osinfo-db-0.20230518/ci/buildenv/opensuse-tumbleweed.sh 2023-05-18 12:58:40.000000000 +0000 @@ -0,0 +1,43 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool manifest ci/manifest.yml +# +# https://gitlab.com/libvirt/libvirt-ci + +function install_buildenv() { + zypper dist-upgrade -y + zypper install -y \ + ca-certificates \ + ccache \ + cppi \ + gcc \ + gettext-runtime \ + git \ + glib2-devel \ + glibc-locale \ + json-glib-devel \ + libarchive-devel \ + libsoup-devel \ + libxml2-devel \ + libxslt-devel \ + make \ + meson \ + ninja \ + pkgconfig \ + python3-base \ + python3-lxml \ + python3-pytest \ + python3-requests \ + rpm-build \ + xz + 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" +export PYTHON="/usr/bin/python3" diff -Nru osinfo-db-0.20220214/ci/buildenv/ubuntu-1804.sh osinfo-db-0.20230518/ci/buildenv/ubuntu-1804.sh --- osinfo-db-0.20220214/ci/buildenv/ubuntu-1804.sh 1970-01-01 00:00:00.000000000 +0000 +++ osinfo-db-0.20230518/ci/buildenv/ubuntu-1804.sh 2023-05-18 12:58:40.000000000 +0000 @@ -0,0 +1,48 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool manifest ci/manifest.yml +# +# https://gitlab.com/libvirt/libvirt-ci + +function install_buildenv() { + export DEBIAN_FRONTEND=noninteractive + apt-get update + apt-get dist-upgrade -y + apt-get install --no-install-recommends -y \ + ca-certificates \ + ccache \ + gcc \ + gettext \ + git \ + libarchive-dev \ + libglib2.0-dev \ + libjson-glib-dev \ + libsoup2.4-dev \ + libxml2-dev \ + libxslt1-dev \ + locales \ + make \ + ninja-build \ + pkgconf \ + python3 \ + python3-lxml \ + python3-pip \ + python3-pytest \ + python3-requests \ + python3-setuptools \ + python3-wheel \ + xz-utils + sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen + dpkg-reconfigure locales + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /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 + /usr/bin/pip3 install meson==0.56.0 +} + +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 -Nru osinfo-db-0.20220214/ci/buildenv/ubuntu-2004.sh osinfo-db-0.20230518/ci/buildenv/ubuntu-2004.sh --- osinfo-db-0.20220214/ci/buildenv/ubuntu-2004.sh 1970-01-01 00:00:00.000000000 +0000 +++ osinfo-db-0.20230518/ci/buildenv/ubuntu-2004.sh 2023-05-18 12:58:40.000000000 +0000 @@ -0,0 +1,48 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool manifest ci/manifest.yml +# +# https://gitlab.com/libvirt/libvirt-ci + +function install_buildenv() { + export DEBIAN_FRONTEND=noninteractive + apt-get update + apt-get dist-upgrade -y + apt-get install --no-install-recommends -y \ + ca-certificates \ + ccache \ + gcc \ + gettext \ + git \ + libarchive-dev \ + libglib2.0-dev \ + libjson-glib-dev \ + libsoup2.4-dev \ + libxml2-dev \ + libxslt1-dev \ + locales \ + make \ + ninja-build \ + pkgconf \ + python3 \ + python3-lxml \ + python3-pip \ + python3-pytest \ + python3-requests \ + python3-setuptools \ + python3-wheel \ + xz-utils + sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen + dpkg-reconfigure locales + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /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 + /usr/bin/pip3 install meson==0.56.0 +} + +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 -Nru osinfo-db-0.20220214/ci/buildenv/ubuntu-2204.sh osinfo-db-0.20230518/ci/buildenv/ubuntu-2204.sh --- osinfo-db-0.20220214/ci/buildenv/ubuntu-2204.sh 1970-01-01 00:00:00.000000000 +0000 +++ osinfo-db-0.20230518/ci/buildenv/ubuntu-2204.sh 2023-05-18 12:58:40.000000000 +0000 @@ -0,0 +1,45 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool manifest ci/manifest.yml +# +# https://gitlab.com/libvirt/libvirt-ci + +function install_buildenv() { + export DEBIAN_FRONTEND=noninteractive + apt-get update + apt-get dist-upgrade -y + apt-get install --no-install-recommends -y \ + ca-certificates \ + ccache \ + gcc \ + gettext \ + git \ + libarchive-dev \ + libglib2.0-dev \ + libjson-glib-dev \ + libsoup2.4-dev \ + libxml2-dev \ + libxslt1-dev \ + locales \ + make \ + meson \ + ninja-build \ + pkgconf \ + python3 \ + python3-lxml \ + python3-pytest \ + python3-requests \ + xz-utils + sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen + dpkg-reconfigure locales + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /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" +export PYTHON="/usr/bin/python3" diff -Nru osinfo-db-0.20220214/ci/containers/centos-8.Dockerfile osinfo-db-0.20230518/ci/containers/centos-8.Dockerfile --- osinfo-db-0.20220214/ci/containers/centos-8.Dockerfile 2022-02-14 10:28:47.000000000 +0000 +++ osinfo-db-0.20230518/ci/containers/centos-8.Dockerfile 1970-01-01 00:00:00.000000000 +0000 @@ -1,48 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool manifest ci/manifest.yml -# -# https://gitlab.com/libvirt/libvirt-ci - -FROM docker.io/library/centos: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 \ - ca-certificates \ - ccache \ - gcc \ - gettext \ - git \ - glib2-devel \ - glibc-langpack-en \ - json-glib-devel \ - libarchive-devel \ - libsoup-devel \ - libxml2-devel \ - libxslt-devel \ - make \ - meson \ - ninja-build \ - pkgconfig \ - python3 \ - python3-lxml \ - python3-pytest \ - python3-requests \ - rpm-build \ - xz && \ - 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 LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff -Nru osinfo-db-0.20220214/ci/containers/centos-stream-8.Dockerfile osinfo-db-0.20230518/ci/containers/centos-stream-8.Dockerfile --- osinfo-db-0.20220214/ci/containers/centos-stream-8.Dockerfile 2022-02-14 10:28:47.000000000 +0000 +++ osinfo-db-0.20230518/ci/containers/centos-stream-8.Dockerfile 2023-05-18 12:58:40.000000000 +0000 @@ -6,11 +6,12 @@ FROM quay.io/centos/centos:stream8 -RUN dnf update -y && \ +RUN dnf distro-sync -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 epel-next-release && \ dnf install -y \ ca-certificates \ ccache \ @@ -41,8 +42,8 @@ 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" ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff -Nru osinfo-db-0.20220214/ci/containers/centos-stream-9.Dockerfile osinfo-db-0.20230518/ci/containers/centos-stream-9.Dockerfile --- osinfo-db-0.20220214/ci/containers/centos-stream-9.Dockerfile 2022-02-14 10:28:47.000000000 +0000 +++ osinfo-db-0.20230518/ci/containers/centos-stream-9.Dockerfile 2023-05-18 12:58:40.000000000 +0000 @@ -6,11 +6,14 @@ FROM quay.io/centos/centos:stream9 -RUN dnf update -y && \ +RUN dnf distro-sync -y && \ dnf install 'dnf-command(config-manager)' -y && \ dnf config-manager --set-enabled -y crb && \ + dnf install -y epel-release && \ + dnf install -y epel-next-release && \ dnf install -y \ ca-certificates \ + ccache \ gcc \ gettext \ git \ @@ -33,8 +36,12 @@ xz && \ dnf autoremove -y && \ dnf clean all -y && \ - rpm -qa | sort > /packages.txt + 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 -Nru osinfo-db-0.20220214/ci/containers/debian-10.Dockerfile osinfo-db-0.20230518/ci/containers/debian-10.Dockerfile --- osinfo-db-0.20220214/ci/containers/debian-10.Dockerfile 2022-02-14 10:28:47.000000000 +0000 +++ osinfo-db-0.20230518/ci/containers/debian-10.Dockerfile 2023-05-18 12:58:40.000000000 +0000 @@ -11,29 +11,29 @@ apt-get install -y eatmydata && \ eatmydata apt-get dist-upgrade -y && \ eatmydata apt-get install --no-install-recommends -y \ - ca-certificates \ - ccache \ - gcc \ - gettext \ - git \ - libarchive-dev \ - libglib2.0-dev \ - libjson-glib-dev \ - libsoup2.4-dev \ - libxml2-dev \ - libxslt1-dev \ - locales \ - make \ - ninja-build \ - pkgconf \ - python3 \ - python3-lxml \ - python3-pip \ - python3-pytest \ - python3-requests \ - python3-setuptools \ - python3-wheel \ - xz-utils && \ + ca-certificates \ + ccache \ + gcc \ + gettext \ + git \ + libarchive-dev \ + libglib2.0-dev \ + libjson-glib-dev \ + libsoup2.4-dev \ + libxml2-dev \ + libxslt1-dev \ + locales \ + make \ + ninja-build \ + pkgconf \ + python3 \ + python3-lxml \ + python3-pip \ + python3-pytest \ + python3-requests \ + python3-setuptools \ + python3-wheel \ + xz-utils && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ @@ -43,11 +43,10 @@ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc -RUN pip3 install \ - meson==0.56.0 +RUN /usr/bin/pip3 install meson==0.56.0 +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" ENV NINJA "/usr/bin/ninja" ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff -Nru osinfo-db-0.20220214/ci/containers/debian-11.Dockerfile osinfo-db-0.20230518/ci/containers/debian-11.Dockerfile --- osinfo-db-0.20220214/ci/containers/debian-11.Dockerfile 2022-02-14 10:28:47.000000000 +0000 +++ osinfo-db-0.20230518/ci/containers/debian-11.Dockerfile 2023-05-18 12:58:40.000000000 +0000 @@ -11,27 +11,27 @@ apt-get install -y eatmydata && \ eatmydata apt-get dist-upgrade -y && \ eatmydata apt-get install --no-install-recommends -y \ - ca-certificates \ - ccache \ - gcc \ - gettext \ - git \ - libarchive-dev \ - libglib2.0-dev \ - libjson-glib-dev \ - libsoup2.4-dev \ - libxml2-dev \ - libxslt1-dev \ - locales \ - make \ - meson \ - ninja-build \ - pkgconf \ - python3 \ - python3-lxml \ - python3-pytest \ - python3-requests \ - xz-utils && \ + ca-certificates \ + ccache \ + gcc \ + gettext \ + git \ + libarchive-dev \ + libglib2.0-dev \ + libjson-glib-dev \ + libsoup2.4-dev \ + libxml2-dev \ + libxslt1-dev \ + locales \ + make \ + meson \ + ninja-build \ + pkgconf \ + python3 \ + python3-lxml \ + python3-pytest \ + python3-requests \ + xz-utils && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ @@ -41,8 +41,8 @@ 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" ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff -Nru osinfo-db-0.20220214/ci/containers/debian-sid.Dockerfile osinfo-db-0.20230518/ci/containers/debian-sid.Dockerfile --- osinfo-db-0.20220214/ci/containers/debian-sid.Dockerfile 2022-02-14 10:28:47.000000000 +0000 +++ osinfo-db-0.20230518/ci/containers/debian-sid.Dockerfile 2023-05-18 12:58:40.000000000 +0000 @@ -11,27 +11,27 @@ apt-get install -y eatmydata && \ eatmydata apt-get dist-upgrade -y && \ eatmydata apt-get install --no-install-recommends -y \ - ca-certificates \ - ccache \ - gcc \ - gettext \ - git \ - libarchive-dev \ - libglib2.0-dev \ - libjson-glib-dev \ - libsoup2.4-dev \ - libxml2-dev \ - libxslt1-dev \ - locales \ - make \ - meson \ - ninja-build \ - pkgconf \ - python3 \ - python3-lxml \ - python3-pytest \ - python3-requests \ - xz-utils && \ + ca-certificates \ + ccache \ + gcc \ + gettext \ + git \ + libarchive-dev \ + libglib2.0-dev \ + libjson-glib-dev \ + libsoup2.4-dev \ + libxml2-dev \ + libxslt1-dev \ + locales \ + make \ + meson \ + ninja-build \ + pkgconf \ + python3 \ + python3-lxml \ + python3-pytest \ + python3-requests \ + xz-utils && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ @@ -41,8 +41,8 @@ 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" ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff -Nru osinfo-db-0.20220214/ci/containers/fedora-34.Dockerfile osinfo-db-0.20230518/ci/containers/fedora-34.Dockerfile --- osinfo-db-0.20220214/ci/containers/fedora-34.Dockerfile 2022-02-14 10:28:47.000000000 +0000 +++ osinfo-db-0.20230518/ci/containers/fedora-34.Dockerfile 1970-01-01 00:00:00.000000000 +0000 @@ -1,54 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool manifest ci/manifest.yml -# -# https://gitlab.com/libvirt/libvirt-ci - -FROM registry.fedoraproject.org/fedora:34 - -RUN dnf install -y nosync && \ - echo -e '#!/bin/sh\n\ -if test -d /usr/lib64\n\ -then\n\ - export LD_PRELOAD=/usr/lib64/nosync/nosync.so\n\ -else\n\ - export LD_PRELOAD=/usr/lib/nosync/nosync.so\n\ -fi\n\ -exec "$@"' > /usr/bin/nosync && \ - chmod +x /usr/bin/nosync && \ - nosync dnf update -y && \ - nosync dnf install -y \ - ca-certificates \ - ccache \ - gcc \ - gettext \ - git \ - glib2-devel \ - glibc-langpack-en \ - json-glib-devel \ - libarchive-devel \ - libsoup-devel \ - libxml2-devel \ - libxslt-devel \ - make \ - meson \ - ninja-build \ - pkgconfig \ - python3 \ - python3-lxml \ - python3-pytest \ - python3-requests \ - rpm-build \ - xz && \ - nosync dnf autoremove -y && \ - nosync 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 LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff -Nru osinfo-db-0.20220214/ci/containers/fedora-35.Dockerfile osinfo-db-0.20230518/ci/containers/fedora-35.Dockerfile --- osinfo-db-0.20220214/ci/containers/fedora-35.Dockerfile 2022-02-14 10:28:47.000000000 +0000 +++ osinfo-db-0.20230518/ci/containers/fedora-35.Dockerfile 2023-05-18 12:58:40.000000000 +0000 @@ -18,28 +18,29 @@ chmod +x /usr/bin/nosync && \ nosync dnf update -y && \ nosync dnf install -y \ - ca-certificates \ - ccache \ - gcc \ - gettext \ - git \ - glib2-devel \ - glibc-langpack-en \ - json-glib-devel \ - libarchive-devel \ - libsoup-devel \ - libxml2-devel \ - libxslt-devel \ - make \ - meson \ - ninja-build \ - pkgconfig \ - python3 \ - python3-lxml \ - python3-pytest \ - python3-requests \ - rpm-build \ - xz && \ + ca-certificates \ + ccache \ + cppi \ + gcc \ + gettext \ + git \ + glib2-devel \ + glibc-langpack-en \ + json-glib-devel \ + libarchive-devel \ + libsoup-devel \ + libxml2-devel \ + libxslt-devel \ + make \ + meson \ + ninja-build \ + pkgconfig \ + python3 \ + python3-lxml \ + python3-pytest \ + python3-requests \ + rpm-build \ + xz && \ nosync dnf autoremove -y && \ nosync dnf clean all -y && \ rpm -qa | sort > /packages.txt && \ @@ -47,8 +48,8 @@ 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" ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff -Nru osinfo-db-0.20220214/ci/containers/fedora-36.Dockerfile osinfo-db-0.20230518/ci/containers/fedora-36.Dockerfile --- osinfo-db-0.20220214/ci/containers/fedora-36.Dockerfile 1970-01-01 00:00:00.000000000 +0000 +++ osinfo-db-0.20230518/ci/containers/fedora-36.Dockerfile 2023-05-18 12:58:40.000000000 +0000 @@ -0,0 +1,55 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool manifest ci/manifest.yml +# +# https://gitlab.com/libvirt/libvirt-ci + +FROM registry.fedoraproject.org/fedora:36 + +RUN dnf install -y nosync && \ + echo -e '#!/bin/sh\n\ +if test -d /usr/lib64\n\ +then\n\ + export LD_PRELOAD=/usr/lib64/nosync/nosync.so\n\ +else\n\ + export LD_PRELOAD=/usr/lib/nosync/nosync.so\n\ +fi\n\ +exec "$@"' > /usr/bin/nosync && \ + chmod +x /usr/bin/nosync && \ + nosync dnf update -y && \ + nosync dnf install -y \ + ca-certificates \ + ccache \ + cppi \ + gcc \ + gettext \ + git \ + glib2-devel \ + glibc-langpack-en \ + json-glib-devel \ + libarchive-devel \ + libsoup-devel \ + libxml2-devel \ + libxslt-devel \ + make \ + meson \ + ninja-build \ + pkgconfig \ + python3 \ + python3-lxml \ + python3-pytest \ + python3-requests \ + rpm-build \ + xz && \ + nosync dnf autoremove -y && \ + nosync 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" +ENV PYTHON "/usr/bin/python3" diff -Nru osinfo-db-0.20220214/ci/containers/fedora-rawhide.Dockerfile osinfo-db-0.20230518/ci/containers/fedora-rawhide.Dockerfile --- osinfo-db-0.20220214/ci/containers/fedora-rawhide.Dockerfile 2022-02-14 10:28:47.000000000 +0000 +++ osinfo-db-0.20230518/ci/containers/fedora-rawhide.Dockerfile 2023-05-18 12:58:40.000000000 +0000 @@ -17,30 +17,31 @@ fi\n\ exec "$@"' > /usr/bin/nosync && \ chmod +x /usr/bin/nosync && \ - nosync dnf update -y && \ + nosync dnf distro-sync -y && \ nosync dnf install -y \ - ca-certificates \ - ccache \ - gcc \ - gettext \ - git \ - glib2-devel \ - glibc-langpack-en \ - json-glib-devel \ - libarchive-devel \ - libsoup-devel \ - libxml2-devel \ - libxslt-devel \ - make \ - meson \ - ninja-build \ - pkgconfig \ - python3 \ - python3-lxml \ - python3-pytest \ - python3-requests \ - rpm-build \ - xz && \ + ca-certificates \ + ccache \ + cppi \ + gcc \ + gettext \ + git \ + glib2-devel \ + glibc-langpack-en \ + json-glib-devel \ + libarchive-devel \ + libsoup-devel \ + libxml2-devel \ + libxslt-devel \ + make \ + meson \ + ninja-build \ + pkgconfig \ + python3 \ + python3-lxml \ + python3-pytest \ + python3-requests \ + rpm-build \ + xz && \ nosync dnf autoremove -y && \ nosync dnf clean all -y && \ rpm -qa | sort > /packages.txt && \ @@ -48,8 +49,8 @@ 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" ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff -Nru osinfo-db-0.20220214/ci/containers/opensuse-leap-152.Dockerfile osinfo-db-0.20230518/ci/containers/opensuse-leap-152.Dockerfile --- osinfo-db-0.20220214/ci/containers/opensuse-leap-152.Dockerfile 2022-02-14 10:28:47.000000000 +0000 +++ osinfo-db-0.20230518/ci/containers/opensuse-leap-152.Dockerfile 1970-01-01 00:00:00.000000000 +0000 @@ -1,48 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool manifest ci/manifest.yml -# -# https://gitlab.com/libvirt/libvirt-ci - -FROM registry.opensuse.org/opensuse/leap:15.2 - -RUN zypper update -y && \ - zypper install -y \ - ca-certificates \ - ccache \ - gcc \ - gettext-runtime \ - git \ - glib2-devel \ - glibc-locale \ - json-glib-devel \ - libarchive-devel \ - libsoup-devel \ - libxml2-devel \ - libxslt-devel \ - make \ - ninja \ - pkgconfig \ - python3-base \ - python3-lxml \ - python3-pip \ - python3-pytest \ - python3-requests \ - python3-setuptools \ - python3-wheel \ - rpm-build \ - xz && \ - zypper clean --all && \ - 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 - -RUN pip3 install \ - meson==0.56.0 - -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff -Nru osinfo-db-0.20220214/ci/containers/opensuse-leap-153.Dockerfile osinfo-db-0.20230518/ci/containers/opensuse-leap-153.Dockerfile --- osinfo-db-0.20220214/ci/containers/opensuse-leap-153.Dockerfile 1970-01-01 00:00:00.000000000 +0000 +++ osinfo-db-0.20230518/ci/containers/opensuse-leap-153.Dockerfile 2023-05-18 12:58:40.000000000 +0000 @@ -0,0 +1,48 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool manifest ci/manifest.yml +# +# https://gitlab.com/libvirt/libvirt-ci + +FROM registry.opensuse.org/opensuse/leap:15.3 + +RUN zypper update -y && \ + zypper install -y \ + ca-certificates \ + ccache \ + cppi \ + gcc \ + gettext-runtime \ + git \ + glib2-devel \ + glibc-locale \ + json-glib-devel \ + libarchive-devel \ + libsoup-devel \ + libxml2-devel \ + libxslt-devel \ + make \ + ninja \ + pkgconfig \ + python3-base \ + python3-lxml \ + python3-pip \ + python3-pytest \ + python3-requests \ + python3-setuptools \ + python3-wheel \ + rpm-build \ + xz && \ + zypper clean --all && \ + 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 + +RUN /usr/bin/pip3 install meson==0.56.0 + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" diff -Nru osinfo-db-0.20220214/ci/containers/opensuse-tumbleweed.Dockerfile osinfo-db-0.20230518/ci/containers/opensuse-tumbleweed.Dockerfile --- osinfo-db-0.20220214/ci/containers/opensuse-tumbleweed.Dockerfile 2022-02-14 10:28:47.000000000 +0000 +++ osinfo-db-0.20230518/ci/containers/opensuse-tumbleweed.Dockerfile 2023-05-18 12:58:40.000000000 +0000 @@ -6,10 +6,11 @@ FROM registry.opensuse.org/opensuse/tumbleweed:latest -RUN zypper update -y && \ +RUN zypper dist-upgrade -y && \ zypper install -y \ ca-certificates \ ccache \ + cppi \ gcc \ gettext-runtime \ git \ @@ -36,8 +37,8 @@ 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" ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff -Nru osinfo-db-0.20220214/ci/containers/ubuntu-1804.Dockerfile osinfo-db-0.20230518/ci/containers/ubuntu-1804.Dockerfile --- osinfo-db-0.20220214/ci/containers/ubuntu-1804.Dockerfile 2022-02-14 10:28:47.000000000 +0000 +++ osinfo-db-0.20230518/ci/containers/ubuntu-1804.Dockerfile 2023-05-18 12:58:40.000000000 +0000 @@ -11,29 +11,29 @@ apt-get install -y eatmydata && \ eatmydata apt-get dist-upgrade -y && \ eatmydata apt-get install --no-install-recommends -y \ - ca-certificates \ - ccache \ - gcc \ - gettext \ - git \ - libarchive-dev \ - libglib2.0-dev \ - libjson-glib-dev \ - libsoup2.4-dev \ - libxml2-dev \ - libxslt1-dev \ - locales \ - make \ - ninja-build \ - pkgconf \ - python3 \ - python3-lxml \ - python3-pip \ - python3-pytest \ - python3-requests \ - python3-setuptools \ - python3-wheel \ - xz-utils && \ + ca-certificates \ + ccache \ + gcc \ + gettext \ + git \ + libarchive-dev \ + libglib2.0-dev \ + libjson-glib-dev \ + libsoup2.4-dev \ + libxml2-dev \ + libxslt1-dev \ + locales \ + make \ + ninja-build \ + pkgconf \ + python3 \ + python3-lxml \ + python3-pip \ + python3-pytest \ + python3-requests \ + python3-setuptools \ + python3-wheel \ + xz-utils && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ @@ -43,11 +43,10 @@ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc -RUN pip3 install \ - meson==0.56.0 +RUN /usr/bin/pip3 install meson==0.56.0 +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" ENV NINJA "/usr/bin/ninja" ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff -Nru osinfo-db-0.20220214/ci/containers/ubuntu-2004.Dockerfile osinfo-db-0.20230518/ci/containers/ubuntu-2004.Dockerfile --- osinfo-db-0.20220214/ci/containers/ubuntu-2004.Dockerfile 2022-02-14 10:28:47.000000000 +0000 +++ osinfo-db-0.20230518/ci/containers/ubuntu-2004.Dockerfile 2023-05-18 12:58:40.000000000 +0000 @@ -11,29 +11,29 @@ apt-get install -y eatmydata && \ eatmydata apt-get dist-upgrade -y && \ eatmydata apt-get install --no-install-recommends -y \ - ca-certificates \ - ccache \ - gcc \ - gettext \ - git \ - libarchive-dev \ - libglib2.0-dev \ - libjson-glib-dev \ - libsoup2.4-dev \ - libxml2-dev \ - libxslt1-dev \ - locales \ - make \ - ninja-build \ - pkgconf \ - python3 \ - python3-lxml \ - python3-pip \ - python3-pytest \ - python3-requests \ - python3-setuptools \ - python3-wheel \ - xz-utils && \ + ca-certificates \ + ccache \ + gcc \ + gettext \ + git \ + libarchive-dev \ + libglib2.0-dev \ + libjson-glib-dev \ + libsoup2.4-dev \ + libxml2-dev \ + libxslt1-dev \ + locales \ + make \ + ninja-build \ + pkgconf \ + python3 \ + python3-lxml \ + python3-pip \ + python3-pytest \ + python3-requests \ + python3-setuptools \ + python3-wheel \ + xz-utils && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ @@ -43,11 +43,10 @@ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc -RUN pip3 install \ - meson==0.56.0 +RUN /usr/bin/pip3 install meson==0.56.0 +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" ENV NINJA "/usr/bin/ninja" ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff -Nru osinfo-db-0.20220214/ci/containers/ubuntu-2204.Dockerfile osinfo-db-0.20230518/ci/containers/ubuntu-2204.Dockerfile --- osinfo-db-0.20220214/ci/containers/ubuntu-2204.Dockerfile 1970-01-01 00:00:00.000000000 +0000 +++ osinfo-db-0.20230518/ci/containers/ubuntu-2204.Dockerfile 2023-05-18 12:58:40.000000000 +0000 @@ -0,0 +1,48 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool manifest ci/manifest.yml +# +# https://gitlab.com/libvirt/libvirt-ci + +FROM docker.io/library/ubuntu:22.04 + +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ + ca-certificates \ + ccache \ + gcc \ + gettext \ + git \ + libarchive-dev \ + libglib2.0-dev \ + libjson-glib-dev \ + libsoup2.4-dev \ + libxml2-dev \ + libxslt1-dev \ + locales \ + make \ + meson \ + ninja-build \ + pkgconf \ + python3 \ + python3-lxml \ + python3-pytest \ + python3-requests \ + xz-utils && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ + sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ + dpkg-reconfigure locales && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /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" +ENV PYTHON "/usr/bin/python3" diff -Nru osinfo-db-0.20220214/ci/gitlab/builds.yml osinfo-db-0.20230518/ci/gitlab/builds.yml --- osinfo-db-0.20220214/ci/gitlab/builds.yml 1970-01-01 00:00:00.000000000 +0000 +++ osinfo-db-0.20230518/ci/gitlab/builds.yml 2023-05-18 12:58:40.000000000 +0000 @@ -0,0 +1,241 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool manifest ci/manifest.yml +# +# https://gitlab.com/libvirt/libvirt-ci + + +# Native build jobs + +x86_64-centos-stream-8-prebuilt-env: + extends: .native_build_job_prebuilt_env + needs: + - job: x86_64-centos-stream-8-container + optional: true + allow_failure: false + variables: + NAME: centos-stream-8 + +x86_64-centos-stream-8-local-env: + extends: .native_build_job_local_env + needs: [] + allow_failure: false + variables: + IMAGE: quay.io/centos/centos:stream8 + NAME: centos-stream-8 + + +x86_64-centos-stream-9-prebuilt-env: + extends: .native_build_job_prebuilt_env + needs: + - job: x86_64-centos-stream-9-container + optional: true + allow_failure: false + variables: + NAME: centos-stream-9 + +x86_64-centos-stream-9-local-env: + extends: .native_build_job_local_env + needs: [] + allow_failure: false + variables: + IMAGE: quay.io/centos/centos:stream9 + NAME: centos-stream-9 + + +x86_64-debian-10-prebuilt-env: + extends: .native_build_job_prebuilt_env + needs: + - job: x86_64-debian-10-container + optional: true + allow_failure: false + variables: + NAME: debian-10 + +x86_64-debian-10-local-env: + extends: .native_build_job_local_env + needs: [] + allow_failure: false + variables: + IMAGE: docker.io/library/debian:10-slim + NAME: debian-10 + + +x86_64-debian-11-prebuilt-env: + extends: .native_build_job_prebuilt_env + needs: + - job: x86_64-debian-11-container + optional: true + allow_failure: false + variables: + NAME: debian-11 + +x86_64-debian-11-local-env: + extends: .native_build_job_local_env + needs: [] + allow_failure: false + variables: + IMAGE: docker.io/library/debian:11-slim + NAME: debian-11 + + +x86_64-debian-sid-prebuilt-env: + extends: .native_build_job_prebuilt_env + needs: + - job: x86_64-debian-sid-container + optional: true + allow_failure: false + variables: + NAME: debian-sid + +x86_64-debian-sid-local-env: + extends: .native_build_job_local_env + needs: [] + allow_failure: false + variables: + IMAGE: docker.io/library/debian:sid-slim + NAME: debian-sid + + +x86_64-fedora-35-prebuilt-env: + extends: .native_build_job_prebuilt_env + needs: + - job: x86_64-fedora-35-container + optional: true + allow_failure: false + variables: + NAME: fedora-35 + +x86_64-fedora-35-local-env: + extends: .native_build_job_local_env + needs: [] + allow_failure: false + variables: + IMAGE: registry.fedoraproject.org/fedora:35 + NAME: fedora-35 + + +x86_64-fedora-36-prebuilt-env: + extends: .native_build_job_prebuilt_env + needs: + - job: x86_64-fedora-36-container + optional: true + allow_failure: false + variables: + NAME: fedora-36 + +x86_64-fedora-36-local-env: + extends: .native_build_job_local_env + needs: [] + allow_failure: false + variables: + IMAGE: registry.fedoraproject.org/fedora:36 + NAME: fedora-36 + + +x86_64-fedora-rawhide-prebuilt-env: + extends: .native_build_job_prebuilt_env + needs: + - job: x86_64-fedora-rawhide-container + optional: true + allow_failure: false + variables: + NAME: fedora-rawhide + +x86_64-fedora-rawhide-local-env: + extends: .native_build_job_local_env + needs: [] + allow_failure: false + variables: + IMAGE: registry.fedoraproject.org/fedora:rawhide + NAME: fedora-rawhide + + +x86_64-opensuse-leap-153-prebuilt-env: + extends: .native_build_job_prebuilt_env + needs: + - job: x86_64-opensuse-leap-153-container + optional: true + allow_failure: false + variables: + NAME: opensuse-leap-153 + +x86_64-opensuse-leap-153-local-env: + extends: .native_build_job_local_env + needs: [] + allow_failure: false + variables: + IMAGE: registry.opensuse.org/opensuse/leap:15.3 + NAME: opensuse-leap-153 + + +x86_64-opensuse-tumbleweed-prebuilt-env: + extends: .native_build_job_prebuilt_env + needs: + - job: x86_64-opensuse-tumbleweed-container + optional: true + allow_failure: false + variables: + NAME: opensuse-tumbleweed + +x86_64-opensuse-tumbleweed-local-env: + extends: .native_build_job_local_env + needs: [] + allow_failure: false + variables: + IMAGE: registry.opensuse.org/opensuse/tumbleweed:latest + NAME: opensuse-tumbleweed + + +x86_64-ubuntu-1804-prebuilt-env: + extends: .native_build_job_prebuilt_env + needs: + - job: x86_64-ubuntu-1804-container + optional: true + allow_failure: false + variables: + NAME: ubuntu-1804 + +x86_64-ubuntu-1804-local-env: + extends: .native_build_job_local_env + needs: [] + allow_failure: false + variables: + IMAGE: docker.io/library/ubuntu:18.04 + NAME: ubuntu-1804 + + +x86_64-ubuntu-2004-prebuilt-env: + extends: .native_build_job_prebuilt_env + needs: + - job: x86_64-ubuntu-2004-container + optional: true + allow_failure: false + variables: + NAME: ubuntu-2004 + +x86_64-ubuntu-2004-local-env: + extends: .native_build_job_local_env + needs: [] + allow_failure: false + variables: + IMAGE: docker.io/library/ubuntu:20.04 + NAME: ubuntu-2004 + + +x86_64-ubuntu-2204-prebuilt-env: + extends: .native_build_job_prebuilt_env + needs: + - job: x86_64-ubuntu-2204-container + optional: true + allow_failure: false + variables: + NAME: ubuntu-2204 + +x86_64-ubuntu-2204-local-env: + extends: .native_build_job_local_env + needs: [] + allow_failure: false + variables: + IMAGE: docker.io/library/ubuntu:22.04 + NAME: ubuntu-2204 diff -Nru osinfo-db-0.20220214/ci/gitlab/build-templates.yml osinfo-db-0.20230518/ci/gitlab/build-templates.yml --- osinfo-db-0.20220214/ci/gitlab/build-templates.yml 1970-01-01 00:00:00.000000000 +0000 +++ osinfo-db-0.20230518/ci/gitlab/build-templates.yml 2023-05-18 12:58:40.000000000 +0000 @@ -0,0 +1,117 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool manifest ci/manifest.yml +# +# https://gitlab.com/libvirt/libvirt-ci + + +# +# We use pre-built containers for any pipelines that are: +# +# - Validating code committed on default upstream branch +# - Validating patches targetting default upstream branch +# which do not have CI changes +# +# We use a local build env for any pipelines that are: +# +# - Validating code committed to a non-default upstream branch +# - Validating patches targetting a non-default upstream branch +# - Validating patches targetting default upstream branch which +# include CI changes +# - Validating code committed to a fork branch +# +# Note: the rules across the prebuilt_env and local_env templates +# should be logical inverses, such that jobs are mutually exclusive +# +.gitlab_native_build_job_prebuilt_env: + image: $CI_REGISTRY/$RUN_UPSTREAM_NAMESPACE/osinfo-db/ci-$NAME:latest + stage: builds + before_script: + - cat /packages.txt + rules: + # upstream: pushes to the default branch + - if: '$CI_PROJECT_NAMESPACE == $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $JOB_OPTIONAL' + when: manual + allow_failure: true + - if: '$CI_PROJECT_NAMESPACE == $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' + when: on_success + + # upstream: other web/api/scheduled pipelines targetting the default branch + - if: '$CI_PROJECT_NAMESPACE == $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE =~ /(web|api|schedule)/ && $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH && $JOB_OPTIONAL' + when: manual + allow_failure: true + - if: '$CI_PROJECT_NAMESPACE == $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE =~ /(web|api|schedule)/ && $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH' + when: on_success + + # upstream+forks: merge requests targetting the default branch, without CI changes + - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH' + changes: + - ci/gitlab/container-templates.yml + - ci/containers/$NAME.Dockerfile + when: never + - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH && $JOB_OPTIONAL' + when: manual + allow_failure: true + - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH' + when: on_success + + # upstream+forks: that's all folks + - when: never + +.gitlab_native_build_job_local_env: + image: $IMAGE + stage: builds + before_script: + - source ci/buildenv/$NAME.sh + - install_buildenv + - cat /packages.txt + rules: + # upstream: pushes to a non-default branch + - if: '$CI_PROJECT_NAMESPACE == $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH && $JOB_OPTIONAL' + when: manual + allow_failure: true + - if: '$CI_PROJECT_NAMESPACE == $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH' + when: on_success + + - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE && $JOB_OPTIONAL' + when: manual + allow_failure: true + - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE' + when: on_success + + # upstream: other web/api/scheduled pipelines targetting non-default branches + - if: '$CI_PROJECT_NAMESPACE == $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE =~ /(web|api|schedule)/ && $CI_COMMIT_REF_NAME != $CI_DEFAULT_BRANCH && $JOB_OPTIONAL' + when: manual + allow_failure: true + - if: '$CI_PROJECT_NAMESPACE == $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE =~ /(web|api|schedule)/ && $CI_COMMIT_REF_NAME != $CI_DEFAULT_BRANCH' + when: on_success + + # forks: other web/api/scheduled pipelines + - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE =~ /(web|api|schedule)/ && $JOB_OPTIONAL' + when: manual + allow_failure: true + - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE =~ /(web|api|schedule)/' + when: on_success + + # upstream+forks: merge requests targetting the default branch, with CI changes + - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH && $JOB_OPTIONAL' + changes: + - ci/gitlab/container-templates.yml + - ci/containers/$NAME.Dockerfile + when: manual + allow_failure: true + - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH' + changes: + - ci/gitlab/container-templates.yml + - ci/containers/$NAME.Dockerfile + when: on_success + + # upstream+forks: merge requests targetting non-default branches + - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME != $CI_DEFAULT_BRANCH && $JOB_OPTIONAL' + when: manual + allow_failure: true + - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME != $CI_DEFAULT_BRANCH' + when: on_success + + # upstream+forks: that's all folks + - when: never diff -Nru osinfo-db-0.20220214/ci/gitlab/containers.yml osinfo-db-0.20230518/ci/gitlab/containers.yml --- osinfo-db-0.20220214/ci/gitlab/containers.yml 1970-01-01 00:00:00.000000000 +0000 +++ osinfo-db-0.20230518/ci/gitlab/containers.yml 2023-05-18 12:58:40.000000000 +0000 @@ -0,0 +1,98 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool manifest ci/manifest.yml +# +# https://gitlab.com/libvirt/libvirt-ci + + +# Native container jobs + +x86_64-centos-stream-8-container: + extends: .container_job + allow_failure: false + variables: + NAME: centos-stream-8 + + +x86_64-centos-stream-9-container: + extends: .container_job + allow_failure: false + variables: + NAME: centos-stream-9 + + +x86_64-debian-10-container: + extends: .container_job + allow_failure: false + variables: + NAME: debian-10 + + +x86_64-debian-11-container: + extends: .container_job + allow_failure: false + variables: + NAME: debian-11 + + +x86_64-debian-sid-container: + extends: .container_job + allow_failure: false + variables: + NAME: debian-sid + + +x86_64-fedora-35-container: + extends: .container_job + allow_failure: false + variables: + NAME: fedora-35 + + +x86_64-fedora-36-container: + extends: .container_job + allow_failure: false + variables: + NAME: fedora-36 + + +x86_64-fedora-rawhide-container: + extends: .container_job + allow_failure: false + variables: + NAME: fedora-rawhide + + +x86_64-opensuse-leap-153-container: + extends: .container_job + allow_failure: false + variables: + NAME: opensuse-leap-153 + + +x86_64-opensuse-tumbleweed-container: + extends: .container_job + allow_failure: false + variables: + NAME: opensuse-tumbleweed + + +x86_64-ubuntu-1804-container: + extends: .container_job + allow_failure: false + variables: + NAME: ubuntu-1804 + + +x86_64-ubuntu-2004-container: + extends: .container_job + allow_failure: false + variables: + NAME: ubuntu-2004 + + +x86_64-ubuntu-2204-container: + extends: .container_job + allow_failure: false + variables: + NAME: ubuntu-2204 diff -Nru osinfo-db-0.20220214/ci/gitlab/container-templates.yml osinfo-db-0.20230518/ci/gitlab/container-templates.yml --- osinfo-db-0.20220214/ci/gitlab/container-templates.yml 1970-01-01 00:00:00.000000000 +0000 +++ osinfo-db-0.20230518/ci/gitlab/container-templates.yml 2023-05-18 12:58:40.000000000 +0000 @@ -0,0 +1,44 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool manifest ci/manifest.yml +# +# https://gitlab.com/libvirt/libvirt-ci + + +# We want to publish containers with tag 'latest': +# +# - In upstream, for push to default branch with CI changes. +# - In upstream, on request, for scheduled/manual pipelines +# against default branch +# +# Note: never publish from merge requests since they have non-committed code +# +.container_job: + image: docker:stable + stage: containers + needs: [] + services: + - docker:dind + before_script: + - export TAG="$CI_REGISTRY_IMAGE/ci-$NAME:latest" + - docker info + - docker login "$CI_REGISTRY" -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" + script: + - docker build --tag "$TAG" -f "ci/containers/$NAME.Dockerfile" ci/containers ; + - docker push "$TAG" + after_script: + - docker logout + rules: + # upstream: publish containers if there were CI changes on the default branch + - if: '$CI_PROJECT_NAMESPACE == $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' + when: on_success + changes: + - ci/gitlab/container-templates.yml + - ci/containers/$NAME.Dockerfile + + # upstream: allow force re-publishing containers on default branch for web/api/scheduled pipelines + - if: '$CI_PROJECT_NAMESPACE == $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE =~ /(web|api|schedule)/ && $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH && $RUN_CONTAINER_BUILDS == "1"' + when: on_success + + # upstream+forks: that's all folks + - when: never diff -Nru osinfo-db-0.20220214/ci/gitlab/sanity-checks.yml osinfo-db-0.20230518/ci/gitlab/sanity-checks.yml --- osinfo-db-0.20220214/ci/gitlab/sanity-checks.yml 1970-01-01 00:00:00.000000000 +0000 +++ osinfo-db-0.20230518/ci/gitlab/sanity-checks.yml 2023-05-18 12:58:40.000000000 +0000 @@ -0,0 +1,26 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool manifest ci/manifest.yml +# +# https://gitlab.com/libvirt/libvirt-ci + + +check-dco: + stage: sanity_checks + needs: [] + image: registry.gitlab.com/libvirt/libvirt-ci/check-dco:master + script: + - /check-dco "$RUN_UPSTREAM_NAMESPACE" + rules: + # upstream+forks: Run pipelines on MR + - if: '$CI_PIPELINE_SOURCE =~ "merge_request_event"' + when: on_success + + # forks: pushes to branches with pipeline requested + - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH && $RUN_PIPELINE' + when: on_success + + # upstream+forks: that's all folks + - when: never + variables: + GIT_DEPTH: 1000 diff -Nru osinfo-db-0.20220214/ci/gitlab.yml osinfo-db-0.20230518/ci/gitlab.yml --- osinfo-db-0.20220214/ci/gitlab.yml 2022-02-14 10:28:47.000000000 +0000 +++ osinfo-db-0.20230518/ci/gitlab.yml 2023-05-18 12:58:40.000000000 +0000 @@ -5,256 +5,78 @@ # https://gitlab.com/libvirt/libvirt-ci -.container_job: - image: docker:stable - stage: containers - needs: [] - services: - - name: registry.gitlab.com/libvirt/libvirt-ci/docker-dind:master - alias: docker - before_script: - - export TAG="$CI_REGISTRY_IMAGE/ci-$NAME:latest" - - export COMMON_TAG="$CI_REGISTRY/libosinfo/osinfo-db/ci-$NAME:latest" - - docker info - - docker login registry.gitlab.com -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" - script: - - docker pull "$TAG" || docker pull "$COMMON_TAG" || true - - docker build --cache-from "$TAG" --cache-from "$COMMON_TAG" --tag "$TAG" -f "ci/containers/$NAME.Dockerfile" ci/containers - - docker push "$TAG" - after_script: - - docker logout - - -.gitlab_native_build_job: - image: $CI_REGISTRY_IMAGE/ci-$NAME:latest - stage: builds - +# Variables that can be set to control the behaviour of +# pipelines that are run +# +# - RUN_PIPELINE - force creation of a CI pipeline when +# pushing to a branch in a forked repository. Official +# CI pipelines are triggered when merge requests are +# created/updated. Setting this variable to a non-empty +# value allows CI testing prior to opening a merge request. +# +# - RUN_CONTAINER_BUILDS - CI pipelines in upstream only +# publish containers if CI file changes are detected. +# Setting this variable to a non-empty value will force +# re-publishing, even when no file changes are detected. +# Typically to use from a scheduled job once a month. +# +# - RUN_UPSTREAM_NAMESPACE - the upstream namespace is +# configured to default to 'libosinfo'. When testing +# changes to CI it might be useful to use a different +# upstream. Setting this variable will override the +# namespace considered to be upstream. +# +# These can be set as git push options +# +# $ git push -o ci.variable=RUN_PIPELINE=1 +# +# Aliases can be set for common usage +# +# $ git config --local alias.push-ci "push -o ci.variable=RUN_PIPELINE=1" +# +# Allowing the less verbose invocation +# +# $ git push-ci +# +# Pipeline variables can also be set in the repository +# pipeline config globally, or set against scheduled pipelines + + +variables: + RUN_UPSTREAM_NAMESPACE: libosinfo + + +workflow: + rules: + # upstream+forks: Avoid duplicate pipelines on pushes, if a MR is open + - if: '$CI_PIPELINE_SOURCE == "push" && $CI_OPEN_MERGE_REQUESTS' + when: never + + # upstream+forks: Avoid pipelines on tag pushes + - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_TAG' + when: never + + # upstream+forks: Allow pipelines in scenarios we've figured out job rules + - if: '$CI_PIPELINE_SOURCE =~ /^(push|merge_request_event|api|web|schedule)$/' + when: always -.gitlab_cross_build_job: - image: $CI_REGISTRY_IMAGE/ci-$NAME-cross-$CROSS:latest - stage: builds + # upstream+forks: Avoid all other pipelines + - when: never -check-dco: +debug: + image: docker.io/library/alpine:3 stage: sanity_checks needs: [] - image: registry.gitlab.com/libvirt/libvirt-ci/check-dco:master script: - - /check-dco libosinfo - except: - variables: - - $CI_PROJECT_NAMESPACE == 'libosinfo' - variables: - GIT_DEPTH: 1000 - - -# Native container jobs - -x86_64-centos-8-container: - extends: .container_job - allow_failure: false - variables: - NAME: centos-8 - - -x86_64-centos-stream-8-container: - extends: .container_job - allow_failure: false - variables: - NAME: centos-stream-8 - - -x86_64-centos-stream-9-container: - extends: .container_job - allow_failure: false - variables: - NAME: centos-stream-9 - - -x86_64-debian-10-container: - extends: .container_job - allow_failure: false - variables: - NAME: debian-10 - - -x86_64-debian-11-container: - extends: .container_job - allow_failure: false - variables: - NAME: debian-11 - - -x86_64-debian-sid-container: - extends: .container_job - allow_failure: false - variables: - NAME: debian-sid - - -x86_64-fedora-34-container: - extends: .container_job - allow_failure: false - variables: - NAME: fedora-34 - - -x86_64-fedora-35-container: - extends: .container_job - allow_failure: false - variables: - NAME: fedora-35 - - -x86_64-fedora-rawhide-container: - extends: .container_job - allow_failure: false - variables: - NAME: fedora-rawhide - - -x86_64-opensuse-leap-152-container: - extends: .container_job - allow_failure: false - variables: - NAME: opensuse-leap-152 - - -x86_64-opensuse-tumbleweed-container: - extends: .container_job - allow_failure: false - variables: - NAME: opensuse-tumbleweed - - -x86_64-ubuntu-1804-container: - extends: .container_job - allow_failure: false - variables: - NAME: ubuntu-1804 - - -x86_64-ubuntu-2004-container: - extends: .container_job - allow_failure: false - variables: - NAME: ubuntu-2004 - - -# Native build jobs - -x86_64-centos-8: - extends: .native_build_job - needs: - - x86_64-centos-8-container - allow_failure: false - variables: - NAME: centos-8 - - -x86_64-centos-stream-8: - extends: .native_build_job - needs: - - x86_64-centos-stream-8-container - allow_failure: false - variables: - NAME: centos-stream-8 - - -x86_64-centos-stream-9: - extends: .native_build_job - needs: - - x86_64-centos-stream-9-container - allow_failure: false - variables: - NAME: centos-stream-9 - - -x86_64-debian-10: - extends: .native_build_job - needs: - - x86_64-debian-10-container - allow_failure: false - variables: - NAME: debian-10 - - -x86_64-debian-11: - extends: .native_build_job - needs: - - x86_64-debian-11-container - allow_failure: false - variables: - NAME: debian-11 - - -x86_64-debian-sid: - extends: .native_build_job - needs: - - x86_64-debian-sid-container - allow_failure: false - variables: - NAME: debian-sid - - -x86_64-fedora-34: - extends: .native_build_job - needs: - - x86_64-fedora-34-container - allow_failure: false - variables: - NAME: fedora-34 - - -x86_64-fedora-35: - extends: .native_build_job - needs: - - x86_64-fedora-35-container - allow_failure: false - variables: - NAME: fedora-35 - - -x86_64-fedora-rawhide: - extends: .native_build_job - needs: - - x86_64-fedora-rawhide-container - allow_failure: false - variables: - NAME: fedora-rawhide - - -x86_64-opensuse-leap-152: - extends: .native_build_job - needs: - - x86_64-opensuse-leap-152-container - allow_failure: false - variables: - NAME: opensuse-leap-152 - - -x86_64-opensuse-tumbleweed: - extends: .native_build_job - needs: - - x86_64-opensuse-tumbleweed-container - allow_failure: false - variables: - NAME: opensuse-tumbleweed - - -x86_64-ubuntu-1804: - extends: .native_build_job - needs: - - x86_64-ubuntu-1804-container - allow_failure: false - variables: - NAME: ubuntu-1804 - - -x86_64-ubuntu-2004: - extends: .native_build_job - needs: - - x86_64-ubuntu-2004-container - allow_failure: false - variables: - NAME: ubuntu-2004 + - printenv | sort + rules: + - if: '$RUN_DEBUG' + when: always + +include: + - local: '/ci/gitlab/container-templates.yml' + - local: '/ci/gitlab/build-templates.yml' + - local: '/ci/gitlab/sanity-checks.yml' + - local: '/ci/gitlab/containers.yml' + - local: '/ci/gitlab/builds.yml' diff -Nru osinfo-db-0.20220214/ci/manifest.yml osinfo-db-0.20230518/ci/manifest.yml --- osinfo-db-0.20220214/ci/manifest.yml 2022-02-14 10:28:47.000000000 +0000 +++ osinfo-db-0.20230518/ci/manifest.yml 2023-05-18 12:58:40.000000000 +0000 @@ -7,8 +7,6 @@ project: osinfo-db targets: - centos-8: x86_64 - centos-stream-8: x86_64 centos-stream-9: x86_64 @@ -19,16 +17,18 @@ debian-sid: x86_64 - fedora-34: x86_64 - fedora-35: x86_64 + fedora-36: x86_64 + fedora-rawhide: x86_64 - opensuse-leap-152: x86_64 + opensuse-leap-153: x86_64 opensuse-tumbleweed: x86_64 ubuntu-1804: x86_64 ubuntu-2004: x86_64 + + ubuntu-2204: x86_64 diff -Nru osinfo-db-0.20220214/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in osinfo-db-0.20230518/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in --- osinfo-db-0.20220214/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in 2022-02-14 10:28:47.000000000 +0000 +++ osinfo-db-0.20230518/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in 2023-05-18 12:58:40.000000000 +0000 @@ -203,7 +203,7 @@ timezone --utc bootloader --location=mbr -zerombr yes +zerombr clearpart --all --drives= diff -Nru osinfo-db-0.20220214/data/install-script/fedoraproject.org/silverblue-kickstart-desktop.xml.in osinfo-db-0.20230518/data/install-script/fedoraproject.org/silverblue-kickstart-desktop.xml.in --- osinfo-db-0.20220214/data/install-script/fedoraproject.org/silverblue-kickstart-desktop.xml.in 2022-02-14 10:28:47.000000000 +0000 +++ osinfo-db-0.20230518/data/install-script/fedoraproject.org/silverblue-kickstart-desktop.xml.in 2023-05-18 12:58:40.000000000 +0000 @@ -64,7 +64,14 @@ - ks= + + + inst.ks= + + + ks= + + file:/ diff -Nru osinfo-db-0.20220214/data/install-script/opensuse.org/opensuse-autoyast-desktop.xml.in osinfo-db-0.20230518/data/install-script/opensuse.org/opensuse-autoyast-desktop.xml.in --- osinfo-db-0.20220214/data/install-script/opensuse.org/opensuse-autoyast-desktop.xml.in 2022-02-14 10:28:47.000000000 +0000 +++ osinfo-db-0.20230518/data/install-script/opensuse.org/opensuse-autoyast-desktop.xml.in 2023-05-18 12:58:40.000000000 +0000 @@ -243,9 +243,16 @@ graphical - - openSUSE - + + + openSUSE + + + + + Leap + + autoyast2-installation gdm diff -Nru osinfo-db-0.20220214/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in osinfo-db-0.20230518/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in --- osinfo-db-0.20220214/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in 2022-02-14 10:28:47.000000000 +0000 +++ osinfo-db-0.20230518/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in 2023-05-18 12:58:40.000000000 +0000 @@ -182,6 +182,13 @@ /os/ + + https://fbi.cdn.euro-linux.com/dist/eurolinux/server/ + + / + + /BaseOS/os/ + https://download.rockylinux.org/pub/rocky/ diff -Nru osinfo-db-0.20220214/data/install-script/redhat.com/rhel-kickstart-jeos.xml.in osinfo-db-0.20230518/data/install-script/redhat.com/rhel-kickstart-jeos.xml.in --- osinfo-db-0.20220214/data/install-script/redhat.com/rhel-kickstart-jeos.xml.in 2022-02-14 10:28:47.000000000 +0000 +++ osinfo-db-0.20230518/data/install-script/redhat.com/rhel-kickstart-jeos.xml.in 2023-05-18 12:58:40.000000000 +0000 @@ -161,6 +161,13 @@ /os/ + + https://fbi.cdn.euro-linux.com/dist/eurolinux/server/ + + / + + /BaseOS/os/ + https://download.rockylinux.org/pub/rocky/ diff -Nru osinfo-db-0.20220214/data/install-script/ubuntu.com/ubuntu-preseed-desktop.xml.in osinfo-db-0.20230518/data/install-script/ubuntu.com/ubuntu-preseed-desktop.xml.in --- osinfo-db-0.20220214/data/install-script/ubuntu.com/ubuntu-preseed-desktop.xml.in 2022-02-14 10:28:47.000000000 +0000 +++ osinfo-db-0.20230518/data/install-script/ubuntu.com/ubuntu-preseed-desktop.xml.in 2023-05-18 12:58:40.000000000 +0000 @@ -63,10 +63,19 @@ +# Configuration inspired by +# https://bazaar.launchpad.net/~ubuntu-test-case-dev/ubuntu-test-cases/desktop/view/head:/preseeds/default.cfg d-i pkgsel/include string ubuntu-desktop d-i debian-installer/locale string d-i netcfg/get_hostname string + + + d-i ubiquity/install_oem false + d-i ubiquity/use_nonfree true + + + d-i partman-auto/disk string d-i partman-auto/init_automatically_partition select Use the largest continuous free space d-i partman-auto/method string regular diff -Nru osinfo-db-0.20220214/data/os/almalinux.org/almalinux-8.xml.in osinfo-db-0.20230518/data/os/almalinux.org/almalinux-8.xml.in --- osinfo-db-0.20220214/data/os/almalinux.org/almalinux-8.xml.in 2022-02-14 10:28:47.000000000 +0000 +++ osinfo-db-0.20230518/data/os/almalinux.org/almalinux-8.xml.in 2023-05-18 12:58:40.000000000 +0000 @@ -1,48 +1,255 @@ - + + almalinux8 AlmaLinux 8 8 - AlmaLinux + AlmaLinux OS Foundation linux almalinux - + 2021-03-30 + + AlmaLinux 8 + + + + AlmaLinux 8 + + + + AlmaLinux 8 + + + + AlmaLinux 8 GNOME + + + + AlmaLinux 8 GNOME Mini + + + + AlmaLinux 8 KDE + + + + AlmaLinux 8 XFCE + + + + AlmaLinux 8 MATE + + + + + https://repo.almalinux.org/almalinux/8/isos/x86_64/AlmaLinux-8-latest-x86_64-boot.iso + + AlmaLinux-8-([3-9]|[1-9][0-9])-x86_64-dvd + + isolinux/initrd.img + isolinux/vmlinuz + + + + + https://repo.almalinux.org/almalinux/8/isos/aarch64/AlmaLinux-8-latest-aarch64-boot.iso + + AlmaLinux-8-([3-9]|[1-9][0-9])-aarch64-dvd + + images/pxeboot/initrd.img + images/pxeboot/vmlinuz + + + + + https://repo.almalinux.org/almalinux/8/isos/ppc64le/AlmaLinux-8-latest-ppc64le-boot.iso + + AlmaLinux-8-([3-9]|[1-9][0-9])-ppc64le-dvd + + ppc/ppc64/initrd.img + ppc/ppc64/vmlinuz + + + + + https://repo.almalinux.org/almalinux/8/isos/s390x/AlmaLinux-8-latest-s390x-boot.iso + + AlmaLinux-8-([3-9]|[1-9][0-9])-s390x-dvd + + images/initrd.img + images/kernel.img + + + + https://repo.almalinux.org/almalinux/8/isos/x86_64/AlmaLinux-8-latest-x86_64-minimal.iso - LINUX - AlmaLinux-8.*-x86_64.* + AlmaLinux-8-([3-9]|[1-9][0-9])-x86_64-dvd - isolinux/vmlinuz - isolinux/initrd.img + isolinux/initrd.img + isolinux/vmlinuz + + + https://repo.almalinux.org/almalinux/8/isos/aarch64/AlmaLinux-8-latest-aarch64-minimal.iso + + AlmaLinux-8-([3-9]|[1-9][0-9])-aarch64-dvd + + images/pxeboot/initrd.img + images/pxeboot/vmlinuz + + + + + https://repo.almalinux.org/almalinux/8/isos/ppc64le/AlmaLinux-8-latest-ppc64le-minimal.iso + + AlmaLinux-8-([3-9]|[1-9][0-9])-ppc64le-dvd + + ppc/ppc64/initrd.img + ppc/ppc64/vmlinuz + + + + + https://repo.almalinux.org/almalinux/8/isos/s390x/AlmaLinux-8-latest-s390x-minimal.iso + + AlmaLinux-8-([3-9]|[1-9][0-9])-s390x-dvd + + images/initrd.img + images/kernel.img + + + + + https://repo.almalinux.org/almalinux/8/isos/x86_64/AlmaLinux-8-latest-x86_64-dvd.iso + + AlmaLinux-8-([3-9]|[1-9][0-9])-x86_64-dvd + + isolinux/initrd.img + isolinux/vmlinuz + + + + + https://repo.almalinux.org/almalinux/8/isos/aarch64/AlmaLinux-8-latest-aarch64-dvd.iso + + AlmaLinux-8-([3-9]|[1-9][0-9])-aarch64-dvd + + images/pxeboot/initrd.img + images/pxeboot/vmlinuz + + + + + https://repo.almalinux.org/almalinux/8/isos/ppc64le/AlmaLinux-8-latest-ppc64le-dvd.iso + + AlmaLinux-8-([3-9]|[1-9][0-9])-ppc64le-dvd + + ppc/ppc64/initrd.img + ppc/ppc64/vmlinuz + + + + + https://repo.almalinux.org/almalinux/8/isos/s390x/AlmaLinux-8-latest-s390x-dvd.iso + + AlmaLinux-8-([3-9]|[1-9][0-9])-s390x-dvd + + images/initrd.img + images/kernel.img + + + + + https://repo.almalinux.org/almalinux/8/live/x86_64/AlmaLinux-8-latest-x86_64-Live-GNOME.iso + + AlmaLinux-8(-|\.)([3-9]|[1-9][0-9])-x86_64-Live-GNOME + + isolinux/initrd.img + isolinux/vmlinuz + + + + + https://repo.almalinux.org/almalinux/8/live/x86_64/AlmaLinux-8-latest-x86_64-Live-GNOME-Mini.iso + + AlmaLinux-8(-|\.)([3-9]|[1-9][0-9])-x86_64-Live-Mini + + isolinux/initrd.img + isolinux/vmlinuz + + + + + https://repo.almalinux.org/almalinux/8/live/x86_64/AlmaLinux-8-latest-x86_64-Live-KDE.iso + + AlmaLinux-8(-|\.)([3-9]|[1-9][0-9])-x86_64-Live-KDE + + isolinux/initrd.img + isolinux/vmlinuz + + + + + https://repo.almalinux.org/almalinux/8/live/x86_64/AlmaLinux-8-latest-x86_64-Live-XFCE.iso - LINUX - AlmaLinux-8.*-aarch64.* + AlmaLinux-8(-|\.)([3-9]|[1-9][0-9])-x86_64-Live-XFCE - isolinux/vmlinuz - isolinux/initrd.img + isolinux/initrd.img + isolinux/vmlinuz + + + + + https://repo.almalinux.org/almalinux/8/live/x86_64/AlmaLinux-8-latest-x86_64-Live-MATE.iso + + AlmaLinux-8(-|\.)([3-9]|[1-9][0-9])-x86_64-Live-MATE + + isolinux/initrd.img + isolinux/vmlinuz - http://repo.almalinux.org/almalinux/8/BaseOS/x86_64/os/ + https://repo.almalinux.org/almalinux/8/BaseOS/x86_64/os/ AlmaLinux ^8$ x86_64 + - http://repo.almalinux.org/almalinux/8/BaseOS/aarch64/os/ + https://repo.almalinux.org/almalinux/8/BaseOS/aarch64/os/ AlmaLinux ^8$ aarch64 + + + https://repo.almalinux.org/almalinux/8/BaseOS/ppc64le/os/ + + AlmaLinux + ^8$ + ppc64le + + + + + https://repo.almalinux.org/almalinux/8/BaseOS/s390x/os/ + + AlmaLinux + ^8$ + s390x + + + AlmaLinux @@ -50,6 +257,22 @@ + + https://repo.almalinux.org/almalinux/8/cloud/x86_64/images/AlmaLinux-8-GenericCloud-latest.x86_64.qcow2 + + + + https://repo.almalinux.org/almalinux/8/cloud/aarch64/images/AlmaLinux-8-GenericCloud-latest.aarch64.qcow2 + + + + https://repo.almalinux.org/almalinux/8/cloud/ppc64le/images/AlmaLinux-8-GenericCloud-latest.ppc64le.qcow2 + + + + https://repo.almalinux.org/almalinux/8/cloud/s390x/images/AlmaLinux-8-GenericCloud-latest.s390x.qcow2 + + 1 @@ -67,6 +290,8 @@ + almalinux +