From 61360d91a7f902d43f65132e61ab67c4f83f36f2 Mon Sep 17 00:00:00 2001 From: Erik Skultety Date: Fri, 11 Aug 2023 11:37:46 +0200 Subject: [PATCH] ci: Add Debian-12 target Signed-off-by: Erik Skultety Reviewed-by: Michal Privoznik --- ci/buildenv/debian-12.sh | 97 ++++++++++++++++++++++++++++ ci/containers/debian-12.Dockerfile | 100 +++++++++++++++++++++++++++++ ci/gitlab/builds.yml | 18 ++++++ ci/gitlab/containers.yml | 7 ++ ci/manifest.yml | 2 + 5 files changed, 224 insertions(+) create mode 100644 ci/buildenv/debian-12.sh create mode 100644 ci/containers/debian-12.Dockerfile diff --git a/ci/buildenv/debian-12.sh b/ci/buildenv/debian-12.sh new file mode 100644 index 0000000000..a40e327db4 --- /dev/null +++ b/ci/buildenv/debian-12.sh @@ -0,0 +1,97 @@ +# 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 \ + augeas-lenses \ + augeas-tools \ + bash-completion \ + ca-certificates \ + ccache \ + clang \ + codespell \ + cpp \ + diffutils \ + dwarves \ + ebtables \ + flake8 \ + gcc \ + gettext \ + git \ + grep \ + iproute2 \ + iptables \ + kmod \ + libacl1-dev \ + libapparmor-dev \ + libattr1-dev \ + libaudit-dev \ + libblkid-dev \ + libc-dev-bin \ + libc6-dev \ + libcap-ng-dev \ + libcurl4-gnutls-dev \ + libdevmapper-dev \ + libfuse-dev \ + libglib2.0-dev \ + libglusterfs-dev \ + libgnutls28-dev \ + libiscsi-dev \ + libnl-3-dev \ + libnl-route-3-dev \ + libnuma-dev \ + libparted-dev \ + libpcap0.8-dev \ + libpciaccess-dev \ + librbd-dev \ + libreadline-dev \ + libsanlock-dev \ + libsasl2-dev \ + libselinux1-dev \ + libssh-gcrypt-dev \ + libssh2-1-dev \ + libtirpc-dev \ + libudev-dev \ + libxen-dev \ + libxml2-dev \ + libxml2-utils \ + libyajl-dev \ + locales \ + lvm2 \ + make \ + meson \ + nfs-common \ + ninja-build \ + numad \ + open-iscsi \ + perl-base \ + pkgconf \ + policykit-1 \ + python3 \ + python3-docutils \ + qemu-utils \ + scrub \ + sed \ + systemtap-sdt-dev \ + wireshark-dev \ + xsltproc + 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/clang + 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 --git a/ci/containers/debian-12.Dockerfile b/ci/containers/debian-12.Dockerfile new file mode 100644 index 0000000000..9867e56955 --- /dev/null +++ b/ci/containers/debian-12.Dockerfile @@ -0,0 +1,100 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool manifest ci/manifest.yml +# +# https://gitlab.com/libvirt/libvirt-ci + +FROM docker.io/library/debian:12-slim + +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 \ + augeas-lenses \ + augeas-tools \ + bash-completion \ + ca-certificates \ + ccache \ + clang \ + codespell \ + cpp \ + diffutils \ + dwarves \ + ebtables \ + flake8 \ + gcc \ + gettext \ + git \ + grep \ + iproute2 \ + iptables \ + kmod \ + libacl1-dev \ + libapparmor-dev \ + libattr1-dev \ + libaudit-dev \ + libblkid-dev \ + libc-dev-bin \ + libc6-dev \ + libcap-ng-dev \ + libcurl4-gnutls-dev \ + libdevmapper-dev \ + libfuse-dev \ + libglib2.0-dev \ + libglusterfs-dev \ + libgnutls28-dev \ + libiscsi-dev \ + libnl-3-dev \ + libnl-route-3-dev \ + libnuma-dev \ + libparted-dev \ + libpcap0.8-dev \ + libpciaccess-dev \ + librbd-dev \ + libreadline-dev \ + libsanlock-dev \ + libsasl2-dev \ + libselinux1-dev \ + libssh-gcrypt-dev \ + libssh2-1-dev \ + libtirpc-dev \ + libudev-dev \ + libxen-dev \ + libxml2-dev \ + libxml2-utils \ + libyajl-dev \ + locales \ + lvm2 \ + make \ + meson \ + nfs-common \ + ninja-build \ + numad \ + open-iscsi \ + perl-base \ + pkgconf \ + policykit-1 \ + python3 \ + python3-docutils \ + qemu-utils \ + scrub \ + sed \ + systemtap-sdt-dev \ + wireshark-dev \ + xsltproc && \ + 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/clang && \ + 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 --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml index f4e67b363e..f15a9fa821 100644 --- a/ci/gitlab/builds.yml +++ b/ci/gitlab/builds.yml @@ -175,6 +175,24 @@ x86_64-debian-11-clang-local-env: NAME: debian-11 +x86_64-debian-12-prebuilt-env: + extends: .native_build_job_prebuilt_env + needs: + - job: x86_64-debian-12-container + optional: true + allow_failure: false + variables: + NAME: debian-12 + +x86_64-debian-12-local-env: + extends: .native_build_job_local_env + needs: [] + allow_failure: false + variables: + IMAGE: docker.io/library/debian:12-slim + NAME: debian-12 + + x86_64-debian-sid-prebuilt-env: extends: .native_build_job_prebuilt_env needs: diff --git a/ci/gitlab/containers.yml b/ci/gitlab/containers.yml index 671483813e..17cf89d120 100644 --- a/ci/gitlab/containers.yml +++ b/ci/gitlab/containers.yml @@ -49,6 +49,13 @@ x86_64-debian-11-container: NAME: debian-11 +x86_64-debian-12-container: + extends: .container_job + allow_failure: false + variables: + NAME: debian-12 + + x86_64-debian-sid-container: extends: .container_job allow_failure: true diff --git a/ci/manifest.yml b/ci/manifest.yml index 4504068a64..6fbd33f374 100644 --- a/ci/manifest.yml +++ b/ci/manifest.yml @@ -79,6 +79,8 @@ targets: containers: false builds: false + debian-12: x86_64 + debian-sid: jobs: - arch: x86_64