[PATCH 0/3] ci: Drop Alpine-314 and Debian-10

Alpine-314 was dropped by lcitool recently. Debian-10 will reach EOL in August, so patches 2-3/3 should be pushed only after the upcoming release. Pipeline: https://gitlab.com/pipo.sk/libvirt/-/pipelines/594315458 Peter Krempa (3): ci: Move builds from alpine-314 to alpine-315 ci: Move active Debian-10 jobs to Debian-11 ci: Drop Debian 10 ci/containers/alpine-314.Dockerfile | 81 ----------- .../debian-10-cross-aarch64.Dockerfile | 125 ----------------- .../debian-10-cross-armv6l.Dockerfile | 124 ----------------- .../debian-10-cross-armv7l.Dockerfile | 125 ----------------- ci/containers/debian-10-cross-i686.Dockerfile | 124 ----------------- ci/containers/debian-10-cross-mips.Dockerfile | 124 ----------------- .../debian-10-cross-mips64el.Dockerfile | 124 ----------------- .../debian-10-cross-mipsel.Dockerfile | 124 ----------------- .../debian-10-cross-ppc64le.Dockerfile | 124 ----------------- .../debian-10-cross-s390x.Dockerfile | 124 ----------------- ci/containers/debian-10.Dockerfile | 105 -------------- ci/gitlab.yml | 2 +- ci/gitlab/builds.yml | 130 ------------------ ci/gitlab/containers.yml | 87 ------------ ci/manifest.yml | 44 ------ 15 files changed, 1 insertion(+), 1566 deletions(-) delete mode 100644 ci/containers/alpine-314.Dockerfile delete mode 100644 ci/containers/debian-10-cross-aarch64.Dockerfile delete mode 100644 ci/containers/debian-10-cross-armv6l.Dockerfile delete mode 100644 ci/containers/debian-10-cross-armv7l.Dockerfile delete mode 100644 ci/containers/debian-10-cross-i686.Dockerfile delete mode 100644 ci/containers/debian-10-cross-mips.Dockerfile delete mode 100644 ci/containers/debian-10-cross-mips64el.Dockerfile delete mode 100644 ci/containers/debian-10-cross-mipsel.Dockerfile delete mode 100644 ci/containers/debian-10-cross-ppc64le.Dockerfile delete mode 100644 ci/containers/debian-10-cross-s390x.Dockerfile delete mode 100644 ci/containers/debian-10.Dockerfile -- 2.36.1

'lcitool' dropped alpine-314 Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- ci/containers/alpine-314.Dockerfile | 81 ----------------------------- ci/gitlab.yml | 2 +- ci/gitlab/builds.yml | 11 ---- ci/gitlab/containers.yml | 8 --- ci/manifest.yml | 3 -- 5 files changed, 1 insertion(+), 104 deletions(-) delete mode 100644 ci/containers/alpine-314.Dockerfile diff --git a/ci/containers/alpine-314.Dockerfile b/ci/containers/alpine-314.Dockerfile deleted file mode 100644 index 1cd3fc6b0c..0000000000 --- a/ci/containers/alpine-314.Dockerfile +++ /dev/null @@ -1,81 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool manifest ci/manifest.yml -# -# https://gitlab.com/libvirt/libvirt-ci - -FROM docker.io/library/alpine:3.14 - -RUN apk update && \ - apk upgrade && \ - apk add \ - acl-dev \ - attr-dev \ - audit-dev \ - augeas \ - bash-completion \ - ca-certificates \ - ccache \ - ceph-dev \ - clang \ - curl-dev \ - cyrus-sasl-dev \ - diffutils \ - eudev-dev \ - fuse-dev \ - gcc \ - gettext \ - git \ - glib-dev \ - gnutls-dev \ - grep \ - iproute2 \ - iptables \ - kmod \ - libcap-ng-dev \ - libnl3-dev \ - libpcap-dev \ - libpciaccess-dev \ - libselinux-dev \ - libssh-dev \ - libssh2-dev \ - libtirpc-dev \ - libxml2-dev \ - libxml2-utils \ - libxslt \ - lvm2 \ - lvm2-dev \ - make \ - meson \ - musl-dev \ - netcf-dev \ - nfs-utils \ - numactl-dev \ - open-iscsi \ - parted-dev \ - perl \ - pkgconf \ - polkit \ - py3-docutils \ - py3-flake8 \ - python3 \ - qemu-img \ - readline-dev \ - rpcgen \ - samurai \ - sed \ - util-linux-dev \ - wireshark-dev \ - xen-dev \ - yajl-dev && \ - apk list | 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 - -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 --git a/ci/gitlab.yml b/ci/gitlab.yml index ea0f847789..ff7c0ba16c 100644 --- a/ci/gitlab.yml +++ b/ci/gitlab.yml @@ -19,7 +19,7 @@ # # $ git config --local alias.push-all-ctr "push -o ci.variable=RUN_ALL_CONTAINERS=1" # -# Allowing the less verbose invokation +# Allowing the less verbose invocation # # $ git push-all-ctr # diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml index 443c1ac299..e3ed4a0753 100644 --- a/ci/gitlab/builds.yml +++ b/ci/gitlab/builds.yml @@ -31,16 +31,6 @@ x86_64-almalinux-8-clang: RPM: skip -x86_64-alpine-314: - extends: .native_build_job - needs: - - job: x86_64-alpine-314-container - optional: true - allow_failure: false - variables: - NAME: alpine-314 - - x86_64-alpine-315: extends: .native_build_job needs: @@ -48,7 +38,6 @@ x86_64-alpine-315: optional: true allow_failure: false variables: - JOB_OPTIONAL: 1 NAME: alpine-315 diff --git a/ci/gitlab/containers.yml b/ci/gitlab/containers.yml index 3835a19216..fe96be32f5 100644 --- a/ci/gitlab/containers.yml +++ b/ci/gitlab/containers.yml @@ -14,18 +14,10 @@ x86_64-almalinux-8-container: NAME: almalinux-8 -x86_64-alpine-314-container: - extends: .container_job - allow_failure: false - variables: - NAME: alpine-314 - - x86_64-alpine-315-container: extends: .container_job allow_failure: false variables: - JOB_OPTIONAL: 1 NAME: alpine-315 diff --git a/ci/manifest.yml b/ci/manifest.yml index 6b8f2bc526..316181b188 100644 --- a/ci/manifest.yml +++ b/ci/manifest.yml @@ -19,12 +19,9 @@ targets: RPM: skip CC: clang - alpine-314: x86_64 - alpine-315: jobs: - arch: x86_64 - builds: false alpine-edge: jobs: -- 2.36.1

On Fri, Jul 22, 2022 at 12:55:58PM +0200, Peter Krempa wrote:
+++ b/ci/manifest.yml @@ -19,12 +19,9 @@ targets: RPM: skip CC: clang
- alpine-314: x86_64 - alpine-315: jobs: - arch: x86_64 - builds: false
This makes for a cleaner diff, but you could also optimize for a more minimal manifest and change the entry to alpine-315: x86_64 instead. Either way, Reviewed-by: Andrea Bolognani <abologna@redhat.com> -- Andrea Bolognani / Red Hat / Virtualization

Debian 10 will reach EOL in august of 2022 and thus libvirt will no longer target it. Move CI jobs over to Debian-11. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- ci/gitlab/builds.yml | 4 ++-- ci/gitlab/containers.yml | 3 ++- ci/manifest.yml | 5 ++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml index e3ed4a0753..953c1b078f 100644 --- a/ci/gitlab/builds.yml +++ b/ci/gitlab/builds.yml @@ -86,6 +86,7 @@ x86_64-debian-10: optional: true allow_failure: false variables: + JOB_OPTIONAL: 1 NAME: debian-10 @@ -96,7 +97,6 @@ x86_64-debian-11: optional: true allow_failure: false variables: - JOB_OPTIONAL: 1 NAME: debian-11 @@ -264,6 +264,7 @@ armv7l-debian-10: allow_failure: false variables: CROSS: armv7l + JOB_OPTIONAL: 1 NAME: debian-10 @@ -371,7 +372,6 @@ armv7l-debian-11: allow_failure: false variables: CROSS: armv7l - JOB_OPTIONAL: 1 NAME: debian-11 diff --git a/ci/gitlab/containers.yml b/ci/gitlab/containers.yml index fe96be32f5..b77baf509e 100644 --- a/ci/gitlab/containers.yml +++ b/ci/gitlab/containers.yml @@ -46,6 +46,7 @@ x86_64-debian-10-container: extends: .container_job allow_failure: false variables: + JOB_OPTIONAL: 1 NAME: debian-10 @@ -135,6 +136,7 @@ armv7l-debian-10-container: extends: .container_job allow_failure: false variables: + JOB_OPTIONAL: 1 NAME: debian-10-cross-armv7l @@ -206,7 +208,6 @@ armv7l-debian-11-container: extends: .container_job allow_failure: false variables: - JOB_OPTIONAL: 1 NAME: debian-11-cross-armv7l diff --git a/ci/manifest.yml b/ci/manifest.yml index 316181b188..01dc5e4c9a 100644 --- a/ci/manifest.yml +++ b/ci/manifest.yml @@ -47,6 +47,7 @@ targets: debian-10: jobs: - arch: x86_64 + builds: false - arch: aarch64 allow-failure: true @@ -57,6 +58,7 @@ targets: builds: false - arch: armv7l + builds: false - arch: i686 allow-failure: true @@ -85,7 +87,6 @@ targets: debian-11: jobs: - arch: x86_64 - builds: false - arch: x86_64 suffix: -clang @@ -99,8 +100,6 @@ targets: builds: false - arch: armv7l - containers: false - builds: false - arch: i686 containers: false -- 2.36.1

On Fri, Jul 22, 2022 at 12:55:59PM +0200, Peter Krempa wrote:
Debian 10 will reach EOL in august of 2022 and thus libvirt will no longer target it. Move CI jobs over to Debian-11.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Erik Skultety <eskultet@redhat.com>

On Fri, Jul 22, 2022 at 12:55:59PM +0200, Peter Krempa wrote:
Debian 10 will reach EOL in august of 2022 and thus libvirt will no longer target it. Move CI jobs over to Debian-11.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- ci/gitlab/builds.yml | 4 ++-- ci/gitlab/containers.yml | 3 ++- ci/manifest.yml | 5 ++--- 3 files changed, 6 insertions(+), 6 deletions(-)
Reviewed-by: Andrea Bolognani <abologna@redhat.com> -- Andrea Bolognani / Red Hat / Virtualization

Debian 10 reaches EOL in August of 2022. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../debian-10-cross-aarch64.Dockerfile | 125 ------------------ .../debian-10-cross-armv6l.Dockerfile | 124 ----------------- .../debian-10-cross-armv7l.Dockerfile | 125 ------------------ ci/containers/debian-10-cross-i686.Dockerfile | 124 ----------------- ci/containers/debian-10-cross-mips.Dockerfile | 124 ----------------- .../debian-10-cross-mips64el.Dockerfile | 124 ----------------- .../debian-10-cross-mipsel.Dockerfile | 124 ----------------- .../debian-10-cross-ppc64le.Dockerfile | 124 ----------------- .../debian-10-cross-s390x.Dockerfile | 124 ----------------- ci/containers/debian-10.Dockerfile | 105 --------------- ci/gitlab/builds.yml | 119 ----------------- ci/gitlab/containers.yml | 80 ----------- ci/manifest.yml | 40 ------ 13 files changed, 1462 deletions(-) delete mode 100644 ci/containers/debian-10-cross-aarch64.Dockerfile delete mode 100644 ci/containers/debian-10-cross-armv6l.Dockerfile delete mode 100644 ci/containers/debian-10-cross-armv7l.Dockerfile delete mode 100644 ci/containers/debian-10-cross-i686.Dockerfile delete mode 100644 ci/containers/debian-10-cross-mips.Dockerfile delete mode 100644 ci/containers/debian-10-cross-mips64el.Dockerfile delete mode 100644 ci/containers/debian-10-cross-mipsel.Dockerfile delete mode 100644 ci/containers/debian-10-cross-ppc64le.Dockerfile delete mode 100644 ci/containers/debian-10-cross-s390x.Dockerfile delete mode 100644 ci/containers/debian-10.Dockerfile diff --git a/ci/containers/debian-10-cross-aarch64.Dockerfile b/ci/containers/debian-10-cross-aarch64.Dockerfile deleted file mode 100644 index f4054490df..0000000000 --- a/ci/containers/debian-10-cross-aarch64.Dockerfile +++ /dev/null @@ -1,125 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool manifest ci/manifest.yml -# -# https://gitlab.com/libvirt/libvirt-ci - -FROM docker.io/library/debian:10-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 \ - codespell \ - cpp \ - diffutils \ - dwarves \ - ebtables \ - flake8 \ - gettext \ - git \ - grep \ - iproute2 \ - iptables \ - kmod \ - libc-dev-bin \ - libxml2-utils \ - locales \ - lvm2 \ - make \ - nfs-common \ - ninja-build \ - numad \ - open-iscsi \ - perl-base \ - pkgconf \ - policykit-1 \ - python3 \ - python3-docutils \ - python3-pip \ - python3-setuptools \ - python3-wheel \ - qemu-utils \ - scrub \ - sed \ - 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 - -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" - -RUN export DEBIAN_FRONTEND=noninteractive && \ - dpkg --add-architecture arm64 && \ - eatmydata apt-get update && \ - eatmydata apt-get dist-upgrade -y && \ - eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ - eatmydata apt-get install --no-install-recommends -y \ - gcc-aarch64-linux-gnu \ - libacl1-dev:arm64 \ - libapparmor-dev:arm64 \ - libattr1-dev:arm64 \ - libaudit-dev:arm64 \ - libblkid-dev:arm64 \ - libc6-dev:arm64 \ - libcap-ng-dev:arm64 \ - libcurl4-gnutls-dev:arm64 \ - libdevmapper-dev:arm64 \ - libfuse-dev:arm64 \ - libglib2.0-dev:arm64 \ - libglusterfs-dev:arm64 \ - libgnutls28-dev:arm64 \ - libiscsi-dev:arm64 \ - libnl-3-dev:arm64 \ - libnl-route-3-dev:arm64 \ - libnuma-dev:arm64 \ - libparted-dev:arm64 \ - libpcap0.8-dev:arm64 \ - libpciaccess-dev:arm64 \ - librbd-dev:arm64 \ - libreadline-dev:arm64 \ - libsanlock-dev:arm64 \ - libsasl2-dev:arm64 \ - libselinux1-dev:arm64 \ - libssh-gcrypt-dev:arm64 \ - libssh2-1-dev:arm64 \ - libtirpc-dev:arm64 \ - libudev-dev:arm64 \ - libxen-dev:arm64 \ - libxml2-dev:arm64 \ - libyajl-dev:arm64 \ - systemtap-sdt-dev:arm64 && \ - eatmydata apt-get autoremove -y && \ - eatmydata apt-get autoclean -y && \ - mkdir -p /usr/local/share/meson/cross && \ - echo "[binaries]\n\ -c = '/usr/bin/aarch64-linux-gnu-gcc'\n\ -ar = '/usr/bin/aarch64-linux-gnu-gcc-ar'\n\ -strip = '/usr/bin/aarch64-linux-gnu-strip'\n\ -pkgconfig = '/usr/bin/aarch64-linux-gnu-pkg-config'\n\ -\n\ -[host_machine]\n\ -system = 'linux'\n\ -cpu_family = 'aarch64'\n\ -cpu = 'aarch64'\n\ -endian = 'little'" > /usr/local/share/meson/cross/aarch64-linux-gnu && \ - 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/aarch64-linux-gnu-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-gcc - -ENV ABI "aarch64-linux-gnu" -ENV MESON_OPTS "--cross-file=aarch64-linux-gnu" diff --git a/ci/containers/debian-10-cross-armv6l.Dockerfile b/ci/containers/debian-10-cross-armv6l.Dockerfile deleted file mode 100644 index 96a6fa94aa..0000000000 --- a/ci/containers/debian-10-cross-armv6l.Dockerfile +++ /dev/null @@ -1,124 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool manifest ci/manifest.yml -# -# https://gitlab.com/libvirt/libvirt-ci - -FROM docker.io/library/debian:10-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 \ - codespell \ - cpp \ - diffutils \ - dwarves \ - ebtables \ - flake8 \ - gettext \ - git \ - grep \ - iproute2 \ - iptables \ - kmod \ - libc-dev-bin \ - libxml2-utils \ - locales \ - lvm2 \ - make \ - nfs-common \ - ninja-build \ - numad \ - open-iscsi \ - perl-base \ - pkgconf \ - policykit-1 \ - python3 \ - python3-docutils \ - python3-pip \ - python3-setuptools \ - python3-wheel \ - qemu-utils \ - scrub \ - sed \ - 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 - -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" - -RUN export DEBIAN_FRONTEND=noninteractive && \ - dpkg --add-architecture armel && \ - eatmydata apt-get update && \ - eatmydata apt-get dist-upgrade -y && \ - eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ - eatmydata apt-get install --no-install-recommends -y \ - gcc-arm-linux-gnueabi \ - libacl1-dev:armel \ - libapparmor-dev:armel \ - libattr1-dev:armel \ - libaudit-dev:armel \ - libblkid-dev:armel \ - libc6-dev:armel \ - libcap-ng-dev:armel \ - libcurl4-gnutls-dev:armel \ - libdevmapper-dev:armel \ - libfuse-dev:armel \ - libglib2.0-dev:armel \ - libglusterfs-dev:armel \ - libgnutls28-dev:armel \ - libiscsi-dev:armel \ - libnl-3-dev:armel \ - libnl-route-3-dev:armel \ - libnuma-dev:armel \ - libparted-dev:armel \ - libpcap0.8-dev:armel \ - libpciaccess-dev:armel \ - librbd-dev:armel \ - libreadline-dev:armel \ - libsanlock-dev:armel \ - libsasl2-dev:armel \ - libselinux1-dev:armel \ - libssh-gcrypt-dev:armel \ - libssh2-1-dev:armel \ - libtirpc-dev:armel \ - libudev-dev:armel \ - libxml2-dev:armel \ - libyajl-dev:armel \ - systemtap-sdt-dev:armel && \ - eatmydata apt-get autoremove -y && \ - eatmydata apt-get autoclean -y && \ - mkdir -p /usr/local/share/meson/cross && \ - echo "[binaries]\n\ -c = '/usr/bin/arm-linux-gnueabi-gcc'\n\ -ar = '/usr/bin/arm-linux-gnueabi-gcc-ar'\n\ -strip = '/usr/bin/arm-linux-gnueabi-strip'\n\ -pkgconfig = '/usr/bin/arm-linux-gnueabi-pkg-config'\n\ -\n\ -[host_machine]\n\ -system = 'linux'\n\ -cpu_family = 'arm'\n\ -cpu = 'arm'\n\ -endian = 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabi && \ - 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/arm-linux-gnueabi-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-gcc - -ENV ABI "arm-linux-gnueabi" -ENV MESON_OPTS "--cross-file=arm-linux-gnueabi" diff --git a/ci/containers/debian-10-cross-armv7l.Dockerfile b/ci/containers/debian-10-cross-armv7l.Dockerfile deleted file mode 100644 index d3c221e87a..0000000000 --- a/ci/containers/debian-10-cross-armv7l.Dockerfile +++ /dev/null @@ -1,125 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool manifest ci/manifest.yml -# -# https://gitlab.com/libvirt/libvirt-ci - -FROM docker.io/library/debian:10-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 \ - codespell \ - cpp \ - diffutils \ - dwarves \ - ebtables \ - flake8 \ - gettext \ - git \ - grep \ - iproute2 \ - iptables \ - kmod \ - libc-dev-bin \ - libxml2-utils \ - locales \ - lvm2 \ - make \ - nfs-common \ - ninja-build \ - numad \ - open-iscsi \ - perl-base \ - pkgconf \ - policykit-1 \ - python3 \ - python3-docutils \ - python3-pip \ - python3-setuptools \ - python3-wheel \ - qemu-utils \ - scrub \ - sed \ - 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 - -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" - -RUN export DEBIAN_FRONTEND=noninteractive && \ - dpkg --add-architecture armhf && \ - eatmydata apt-get update && \ - eatmydata apt-get dist-upgrade -y && \ - eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ - eatmydata apt-get install --no-install-recommends -y \ - gcc-arm-linux-gnueabihf \ - libacl1-dev:armhf \ - libapparmor-dev:armhf \ - libattr1-dev:armhf \ - libaudit-dev:armhf \ - libblkid-dev:armhf \ - libc6-dev:armhf \ - libcap-ng-dev:armhf \ - libcurl4-gnutls-dev:armhf \ - libdevmapper-dev:armhf \ - libfuse-dev:armhf \ - libglib2.0-dev:armhf \ - libglusterfs-dev:armhf \ - libgnutls28-dev:armhf \ - libiscsi-dev:armhf \ - libnl-3-dev:armhf \ - libnl-route-3-dev:armhf \ - libnuma-dev:armhf \ - libparted-dev:armhf \ - libpcap0.8-dev:armhf \ - libpciaccess-dev:armhf \ - librbd-dev:armhf \ - libreadline-dev:armhf \ - libsanlock-dev:armhf \ - libsasl2-dev:armhf \ - libselinux1-dev:armhf \ - libssh-gcrypt-dev:armhf \ - libssh2-1-dev:armhf \ - libtirpc-dev:armhf \ - libudev-dev:armhf \ - libxen-dev:armhf \ - libxml2-dev:armhf \ - libyajl-dev:armhf \ - systemtap-sdt-dev:armhf && \ - eatmydata apt-get autoremove -y && \ - eatmydata apt-get autoclean -y && \ - mkdir -p /usr/local/share/meson/cross && \ - echo "[binaries]\n\ -c = '/usr/bin/arm-linux-gnueabihf-gcc'\n\ -ar = '/usr/bin/arm-linux-gnueabihf-gcc-ar'\n\ -strip = '/usr/bin/arm-linux-gnueabihf-strip'\n\ -pkgconfig = '/usr/bin/arm-linux-gnueabihf-pkg-config'\n\ -\n\ -[host_machine]\n\ -system = 'linux'\n\ -cpu_family = 'arm'\n\ -cpu = 'armhf'\n\ -endian = 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabihf && \ - 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/arm-linux-gnueabihf-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-gcc - -ENV ABI "arm-linux-gnueabihf" -ENV MESON_OPTS "--cross-file=arm-linux-gnueabihf" diff --git a/ci/containers/debian-10-cross-i686.Dockerfile b/ci/containers/debian-10-cross-i686.Dockerfile deleted file mode 100644 index 37f4962286..0000000000 --- a/ci/containers/debian-10-cross-i686.Dockerfile +++ /dev/null @@ -1,124 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool manifest ci/manifest.yml -# -# https://gitlab.com/libvirt/libvirt-ci - -FROM docker.io/library/debian:10-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 \ - codespell \ - cpp \ - diffutils \ - dwarves \ - ebtables \ - flake8 \ - gettext \ - git \ - grep \ - iproute2 \ - iptables \ - kmod \ - libc-dev-bin \ - libxml2-utils \ - locales \ - lvm2 \ - make \ - nfs-common \ - ninja-build \ - numad \ - open-iscsi \ - perl-base \ - pkgconf \ - policykit-1 \ - python3 \ - python3-docutils \ - python3-pip \ - python3-setuptools \ - python3-wheel \ - qemu-utils \ - scrub \ - sed \ - 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 - -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" - -RUN export DEBIAN_FRONTEND=noninteractive && \ - dpkg --add-architecture i386 && \ - eatmydata apt-get update && \ - eatmydata apt-get dist-upgrade -y && \ - eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ - eatmydata apt-get install --no-install-recommends -y \ - gcc-i686-linux-gnu \ - libacl1-dev:i386 \ - libapparmor-dev:i386 \ - libattr1-dev:i386 \ - libaudit-dev:i386 \ - libblkid-dev:i386 \ - libc6-dev:i386 \ - libcap-ng-dev:i386 \ - libcurl4-gnutls-dev:i386 \ - libdevmapper-dev:i386 \ - libfuse-dev:i386 \ - libglib2.0-dev:i386 \ - libglusterfs-dev:i386 \ - libgnutls28-dev:i386 \ - libiscsi-dev:i386 \ - libnl-3-dev:i386 \ - libnl-route-3-dev:i386 \ - libnuma-dev:i386 \ - libparted-dev:i386 \ - libpcap0.8-dev:i386 \ - libpciaccess-dev:i386 \ - librbd-dev:i386 \ - libreadline-dev:i386 \ - libsanlock-dev:i386 \ - libsasl2-dev:i386 \ - libselinux1-dev:i386 \ - libssh-gcrypt-dev:i386 \ - libssh2-1-dev:i386 \ - libtirpc-dev:i386 \ - libudev-dev:i386 \ - libxml2-dev:i386 \ - libyajl-dev:i386 \ - systemtap-sdt-dev:i386 && \ - eatmydata apt-get autoremove -y && \ - eatmydata apt-get autoclean -y && \ - mkdir -p /usr/local/share/meson/cross && \ - echo "[binaries]\n\ -c = '/usr/bin/i686-linux-gnu-gcc'\n\ -ar = '/usr/bin/i686-linux-gnu-gcc-ar'\n\ -strip = '/usr/bin/i686-linux-gnu-strip'\n\ -pkgconfig = '/usr/bin/i686-linux-gnu-pkg-config'\n\ -\n\ -[host_machine]\n\ -system = 'linux'\n\ -cpu_family = 'x86'\n\ -cpu = 'i686'\n\ -endian = 'little'" > /usr/local/share/meson/cross/i686-linux-gnu && \ - 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/i686-linux-gnu-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-gcc - -ENV ABI "i686-linux-gnu" -ENV MESON_OPTS "--cross-file=i686-linux-gnu" diff --git a/ci/containers/debian-10-cross-mips.Dockerfile b/ci/containers/debian-10-cross-mips.Dockerfile deleted file mode 100644 index 7c8847260f..0000000000 --- a/ci/containers/debian-10-cross-mips.Dockerfile +++ /dev/null @@ -1,124 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool manifest ci/manifest.yml -# -# https://gitlab.com/libvirt/libvirt-ci - -FROM docker.io/library/debian:10-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 \ - codespell \ - cpp \ - diffutils \ - dwarves \ - ebtables \ - flake8 \ - gettext \ - git \ - grep \ - iproute2 \ - iptables \ - kmod \ - libc-dev-bin \ - libxml2-utils \ - locales \ - lvm2 \ - make \ - nfs-common \ - ninja-build \ - numad \ - open-iscsi \ - perl-base \ - pkgconf \ - policykit-1 \ - python3 \ - python3-docutils \ - python3-pip \ - python3-setuptools \ - python3-wheel \ - qemu-utils \ - scrub \ - sed \ - 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 - -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" - -RUN export DEBIAN_FRONTEND=noninteractive && \ - dpkg --add-architecture mips && \ - eatmydata apt-get update && \ - eatmydata apt-get dist-upgrade -y && \ - eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ - eatmydata apt-get install --no-install-recommends -y \ - gcc-mips-linux-gnu \ - libacl1-dev:mips \ - libapparmor-dev:mips \ - libattr1-dev:mips \ - libaudit-dev:mips \ - libblkid-dev:mips \ - libc6-dev:mips \ - libcap-ng-dev:mips \ - libcurl4-gnutls-dev:mips \ - libdevmapper-dev:mips \ - libfuse-dev:mips \ - libglib2.0-dev:mips \ - libglusterfs-dev:mips \ - libgnutls28-dev:mips \ - libiscsi-dev:mips \ - libnl-3-dev:mips \ - libnl-route-3-dev:mips \ - libnuma-dev:mips \ - libparted-dev:mips \ - libpcap0.8-dev:mips \ - libpciaccess-dev:mips \ - librbd-dev:mips \ - libreadline-dev:mips \ - libsanlock-dev:mips \ - libsasl2-dev:mips \ - libselinux1-dev:mips \ - libssh-gcrypt-dev:mips \ - libssh2-1-dev:mips \ - libtirpc-dev:mips \ - libudev-dev:mips \ - libxml2-dev:mips \ - libyajl-dev:mips \ - systemtap-sdt-dev:mips && \ - eatmydata apt-get autoremove -y && \ - eatmydata apt-get autoclean -y && \ - mkdir -p /usr/local/share/meson/cross && \ - echo "[binaries]\n\ -c = '/usr/bin/mips-linux-gnu-gcc'\n\ -ar = '/usr/bin/mips-linux-gnu-gcc-ar'\n\ -strip = '/usr/bin/mips-linux-gnu-strip'\n\ -pkgconfig = '/usr/bin/mips-linux-gnu-pkg-config'\n\ -\n\ -[host_machine]\n\ -system = 'linux'\n\ -cpu_family = 'mips'\n\ -cpu = 'mips'\n\ -endian = 'big'" > /usr/local/share/meson/cross/mips-linux-gnu && \ - 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/mips-linux-gnu-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips-linux-gnu-gcc - -ENV ABI "mips-linux-gnu" -ENV MESON_OPTS "--cross-file=mips-linux-gnu" diff --git a/ci/containers/debian-10-cross-mips64el.Dockerfile b/ci/containers/debian-10-cross-mips64el.Dockerfile deleted file mode 100644 index 0cc7bc7034..0000000000 --- a/ci/containers/debian-10-cross-mips64el.Dockerfile +++ /dev/null @@ -1,124 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool manifest ci/manifest.yml -# -# https://gitlab.com/libvirt/libvirt-ci - -FROM docker.io/library/debian:10-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 \ - codespell \ - cpp \ - diffutils \ - dwarves \ - ebtables \ - flake8 \ - gettext \ - git \ - grep \ - iproute2 \ - iptables \ - kmod \ - libc-dev-bin \ - libxml2-utils \ - locales \ - lvm2 \ - make \ - nfs-common \ - ninja-build \ - numad \ - open-iscsi \ - perl-base \ - pkgconf \ - policykit-1 \ - python3 \ - python3-docutils \ - python3-pip \ - python3-setuptools \ - python3-wheel \ - qemu-utils \ - scrub \ - sed \ - 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 - -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" - -RUN export DEBIAN_FRONTEND=noninteractive && \ - dpkg --add-architecture mips64el && \ - eatmydata apt-get update && \ - eatmydata apt-get dist-upgrade -y && \ - eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ - eatmydata apt-get install --no-install-recommends -y \ - gcc-mips64el-linux-gnuabi64 \ - libacl1-dev:mips64el \ - libapparmor-dev:mips64el \ - libattr1-dev:mips64el \ - libaudit-dev:mips64el \ - libblkid-dev:mips64el \ - libc6-dev:mips64el \ - libcap-ng-dev:mips64el \ - libcurl4-gnutls-dev:mips64el \ - libdevmapper-dev:mips64el \ - libfuse-dev:mips64el \ - libglib2.0-dev:mips64el \ - libglusterfs-dev:mips64el \ - libgnutls28-dev:mips64el \ - libiscsi-dev:mips64el \ - libnl-3-dev:mips64el \ - libnl-route-3-dev:mips64el \ - libnuma-dev:mips64el \ - libparted-dev:mips64el \ - libpcap0.8-dev:mips64el \ - libpciaccess-dev:mips64el \ - librbd-dev:mips64el \ - libreadline-dev:mips64el \ - libsanlock-dev:mips64el \ - libsasl2-dev:mips64el \ - libselinux1-dev:mips64el \ - libssh-gcrypt-dev:mips64el \ - libssh2-1-dev:mips64el \ - libtirpc-dev:mips64el \ - libudev-dev:mips64el \ - libxml2-dev:mips64el \ - libyajl-dev:mips64el \ - systemtap-sdt-dev:mips64el && \ - eatmydata apt-get autoremove -y && \ - eatmydata apt-get autoclean -y && \ - mkdir -p /usr/local/share/meson/cross && \ - echo "[binaries]\n\ -c = '/usr/bin/mips64el-linux-gnuabi64-gcc'\n\ -ar = '/usr/bin/mips64el-linux-gnuabi64-gcc-ar'\n\ -strip = '/usr/bin/mips64el-linux-gnuabi64-strip'\n\ -pkgconfig = '/usr/bin/mips64el-linux-gnuabi64-pkg-config'\n\ -\n\ -[host_machine]\n\ -system = 'linux'\n\ -cpu_family = 'mips64'\n\ -cpu = 'mips64el'\n\ -endian = 'little'" > /usr/local/share/meson/cross/mips64el-linux-gnuabi64 && \ - 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/mips64el-linux-gnuabi64-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-gcc - -ENV ABI "mips64el-linux-gnuabi64" -ENV MESON_OPTS "--cross-file=mips64el-linux-gnuabi64" diff --git a/ci/containers/debian-10-cross-mipsel.Dockerfile b/ci/containers/debian-10-cross-mipsel.Dockerfile deleted file mode 100644 index ae3fd260ea..0000000000 --- a/ci/containers/debian-10-cross-mipsel.Dockerfile +++ /dev/null @@ -1,124 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool manifest ci/manifest.yml -# -# https://gitlab.com/libvirt/libvirt-ci - -FROM docker.io/library/debian:10-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 \ - codespell \ - cpp \ - diffutils \ - dwarves \ - ebtables \ - flake8 \ - gettext \ - git \ - grep \ - iproute2 \ - iptables \ - kmod \ - libc-dev-bin \ - libxml2-utils \ - locales \ - lvm2 \ - make \ - nfs-common \ - ninja-build \ - numad \ - open-iscsi \ - perl-base \ - pkgconf \ - policykit-1 \ - python3 \ - python3-docutils \ - python3-pip \ - python3-setuptools \ - python3-wheel \ - qemu-utils \ - scrub \ - sed \ - 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 - -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" - -RUN export DEBIAN_FRONTEND=noninteractive && \ - dpkg --add-architecture mipsel && \ - eatmydata apt-get update && \ - eatmydata apt-get dist-upgrade -y && \ - eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ - eatmydata apt-get install --no-install-recommends -y \ - gcc-mipsel-linux-gnu \ - libacl1-dev:mipsel \ - libapparmor-dev:mipsel \ - libattr1-dev:mipsel \ - libaudit-dev:mipsel \ - libblkid-dev:mipsel \ - libc6-dev:mipsel \ - libcap-ng-dev:mipsel \ - libcurl4-gnutls-dev:mipsel \ - libdevmapper-dev:mipsel \ - libfuse-dev:mipsel \ - libglib2.0-dev:mipsel \ - libglusterfs-dev:mipsel \ - libgnutls28-dev:mipsel \ - libiscsi-dev:mipsel \ - libnl-3-dev:mipsel \ - libnl-route-3-dev:mipsel \ - libnuma-dev:mipsel \ - libparted-dev:mipsel \ - libpcap0.8-dev:mipsel \ - libpciaccess-dev:mipsel \ - librbd-dev:mipsel \ - libreadline-dev:mipsel \ - libsanlock-dev:mipsel \ - libsasl2-dev:mipsel \ - libselinux1-dev:mipsel \ - libssh-gcrypt-dev:mipsel \ - libssh2-1-dev:mipsel \ - libtirpc-dev:mipsel \ - libudev-dev:mipsel \ - libxml2-dev:mipsel \ - libyajl-dev:mipsel \ - systemtap-sdt-dev:mipsel && \ - eatmydata apt-get autoremove -y && \ - eatmydata apt-get autoclean -y && \ - mkdir -p /usr/local/share/meson/cross && \ - echo "[binaries]\n\ -c = '/usr/bin/mipsel-linux-gnu-gcc'\n\ -ar = '/usr/bin/mipsel-linux-gnu-gcc-ar'\n\ -strip = '/usr/bin/mipsel-linux-gnu-strip'\n\ -pkgconfig = '/usr/bin/mipsel-linux-gnu-pkg-config'\n\ -\n\ -[host_machine]\n\ -system = 'linux'\n\ -cpu_family = 'mips'\n\ -cpu = 'mipsel'\n\ -endian = 'little'" > /usr/local/share/meson/cross/mipsel-linux-gnu && \ - 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/mipsel-linux-gnu-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-gcc - -ENV ABI "mipsel-linux-gnu" -ENV MESON_OPTS "--cross-file=mipsel-linux-gnu" diff --git a/ci/containers/debian-10-cross-ppc64le.Dockerfile b/ci/containers/debian-10-cross-ppc64le.Dockerfile deleted file mode 100644 index 7cd3a3a419..0000000000 --- a/ci/containers/debian-10-cross-ppc64le.Dockerfile +++ /dev/null @@ -1,124 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool manifest ci/manifest.yml -# -# https://gitlab.com/libvirt/libvirt-ci - -FROM docker.io/library/debian:10-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 \ - codespell \ - cpp \ - diffutils \ - dwarves \ - ebtables \ - flake8 \ - gettext \ - git \ - grep \ - iproute2 \ - iptables \ - kmod \ - libc-dev-bin \ - libxml2-utils \ - locales \ - lvm2 \ - make \ - nfs-common \ - ninja-build \ - numad \ - open-iscsi \ - perl-base \ - pkgconf \ - policykit-1 \ - python3 \ - python3-docutils \ - python3-pip \ - python3-setuptools \ - python3-wheel \ - qemu-utils \ - scrub \ - sed \ - 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 - -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" - -RUN export DEBIAN_FRONTEND=noninteractive && \ - dpkg --add-architecture ppc64el && \ - eatmydata apt-get update && \ - eatmydata apt-get dist-upgrade -y && \ - eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ - eatmydata apt-get install --no-install-recommends -y \ - gcc-powerpc64le-linux-gnu \ - libacl1-dev:ppc64el \ - libapparmor-dev:ppc64el \ - libattr1-dev:ppc64el \ - libaudit-dev:ppc64el \ - libblkid-dev:ppc64el \ - libc6-dev:ppc64el \ - libcap-ng-dev:ppc64el \ - libcurl4-gnutls-dev:ppc64el \ - libdevmapper-dev:ppc64el \ - libfuse-dev:ppc64el \ - libglib2.0-dev:ppc64el \ - libglusterfs-dev:ppc64el \ - libgnutls28-dev:ppc64el \ - libiscsi-dev:ppc64el \ - libnl-3-dev:ppc64el \ - libnl-route-3-dev:ppc64el \ - libnuma-dev:ppc64el \ - libparted-dev:ppc64el \ - libpcap0.8-dev:ppc64el \ - libpciaccess-dev:ppc64el \ - librbd-dev:ppc64el \ - libreadline-dev:ppc64el \ - libsanlock-dev:ppc64el \ - libsasl2-dev:ppc64el \ - libselinux1-dev:ppc64el \ - libssh-gcrypt-dev:ppc64el \ - libssh2-1-dev:ppc64el \ - libtirpc-dev:ppc64el \ - libudev-dev:ppc64el \ - libxml2-dev:ppc64el \ - libyajl-dev:ppc64el \ - systemtap-sdt-dev:ppc64el && \ - eatmydata apt-get autoremove -y && \ - eatmydata apt-get autoclean -y && \ - mkdir -p /usr/local/share/meson/cross && \ - echo "[binaries]\n\ -c = '/usr/bin/powerpc64le-linux-gnu-gcc'\n\ -ar = '/usr/bin/powerpc64le-linux-gnu-gcc-ar'\n\ -strip = '/usr/bin/powerpc64le-linux-gnu-strip'\n\ -pkgconfig = '/usr/bin/powerpc64le-linux-gnu-pkg-config'\n\ -\n\ -[host_machine]\n\ -system = 'linux'\n\ -cpu_family = 'ppc64'\n\ -cpu = 'powerpc64le'\n\ -endian = 'little'" > /usr/local/share/meson/cross/powerpc64le-linux-gnu && \ - 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/powerpc64le-linux-gnu-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-gcc - -ENV ABI "powerpc64le-linux-gnu" -ENV MESON_OPTS "--cross-file=powerpc64le-linux-gnu" diff --git a/ci/containers/debian-10-cross-s390x.Dockerfile b/ci/containers/debian-10-cross-s390x.Dockerfile deleted file mode 100644 index 589a5b1d9c..0000000000 --- a/ci/containers/debian-10-cross-s390x.Dockerfile +++ /dev/null @@ -1,124 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool manifest ci/manifest.yml -# -# https://gitlab.com/libvirt/libvirt-ci - -FROM docker.io/library/debian:10-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 \ - codespell \ - cpp \ - diffutils \ - dwarves \ - ebtables \ - flake8 \ - gettext \ - git \ - grep \ - iproute2 \ - iptables \ - kmod \ - libc-dev-bin \ - libxml2-utils \ - locales \ - lvm2 \ - make \ - nfs-common \ - ninja-build \ - numad \ - open-iscsi \ - perl-base \ - pkgconf \ - policykit-1 \ - python3 \ - python3-docutils \ - python3-pip \ - python3-setuptools \ - python3-wheel \ - qemu-utils \ - scrub \ - sed \ - 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 - -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" - -RUN export DEBIAN_FRONTEND=noninteractive && \ - dpkg --add-architecture s390x && \ - eatmydata apt-get update && \ - eatmydata apt-get dist-upgrade -y && \ - eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ - eatmydata apt-get install --no-install-recommends -y \ - gcc-s390x-linux-gnu \ - libacl1-dev:s390x \ - libapparmor-dev:s390x \ - libattr1-dev:s390x \ - libaudit-dev:s390x \ - libblkid-dev:s390x \ - libc6-dev:s390x \ - libcap-ng-dev:s390x \ - libcurl4-gnutls-dev:s390x \ - libdevmapper-dev:s390x \ - libfuse-dev:s390x \ - libglib2.0-dev:s390x \ - libglusterfs-dev:s390x \ - libgnutls28-dev:s390x \ - libiscsi-dev:s390x \ - libnl-3-dev:s390x \ - libnl-route-3-dev:s390x \ - libnuma-dev:s390x \ - libparted-dev:s390x \ - libpcap0.8-dev:s390x \ - libpciaccess-dev:s390x \ - librbd-dev:s390x \ - libreadline-dev:s390x \ - libsanlock-dev:s390x \ - libsasl2-dev:s390x \ - libselinux1-dev:s390x \ - libssh-gcrypt-dev:s390x \ - libssh2-1-dev:s390x \ - libtirpc-dev:s390x \ - libudev-dev:s390x \ - libxml2-dev:s390x \ - libyajl-dev:s390x \ - systemtap-sdt-dev:s390x && \ - eatmydata apt-get autoremove -y && \ - eatmydata apt-get autoclean -y && \ - mkdir -p /usr/local/share/meson/cross && \ - echo "[binaries]\n\ -c = '/usr/bin/s390x-linux-gnu-gcc'\n\ -ar = '/usr/bin/s390x-linux-gnu-gcc-ar'\n\ -strip = '/usr/bin/s390x-linux-gnu-strip'\n\ -pkgconfig = '/usr/bin/s390x-linux-gnu-pkg-config'\n\ -\n\ -[host_machine]\n\ -system = 'linux'\n\ -cpu_family = 's390x'\n\ -cpu = 's390x'\n\ -endian = 'big'" > /usr/local/share/meson/cross/s390x-linux-gnu && \ - 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/s390x-linux-gnu-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-gcc - -ENV ABI "s390x-linux-gnu" -ENV MESON_OPTS "--cross-file=s390x-linux-gnu" diff --git a/ci/containers/debian-10.Dockerfile b/ci/containers/debian-10.Dockerfile deleted file mode 100644 index 41691c708f..0000000000 --- a/ci/containers/debian-10.Dockerfile +++ /dev/null @@ -1,105 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool manifest ci/manifest.yml -# -# https://gitlab.com/libvirt/libvirt-ci - -FROM docker.io/library/debian:10-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 \ - libnetcf-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 \ - nfs-common \ - ninja-build \ - numad \ - open-iscsi \ - perl-base \ - pkgconf \ - policykit-1 \ - python3 \ - python3-docutils \ - python3-pip \ - python3-setuptools \ - python3-wheel \ - 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 - -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 --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml index 953c1b078f..4e8c3d3510 100644 --- a/ci/gitlab/builds.yml +++ b/ci/gitlab/builds.yml @@ -79,17 +79,6 @@ x86_64-centos-stream-9: - libvirt-rpms -x86_64-debian-10: - extends: .native_build_job - needs: - - job: x86_64-debian-10-container - optional: true - allow_failure: false - variables: - JOB_OPTIONAL: 1 - NAME: debian-10 - - x86_64-debian-11: extends: .native_build_job needs: @@ -232,114 +221,6 @@ x86_64-ubuntu-2204-clang: # Cross build jobs -aarch64-debian-10: - extends: .cross_build_job - needs: - - job: aarch64-debian-10-container - optional: true - allow_failure: true - variables: - CROSS: aarch64 - JOB_OPTIONAL: 1 - NAME: debian-10 - - -armv6l-debian-10: - extends: .cross_build_job - needs: - - job: armv6l-debian-10-container - optional: true - allow_failure: true - variables: - CROSS: armv6l - JOB_OPTIONAL: 1 - NAME: debian-10 - - -armv7l-debian-10: - extends: .cross_build_job - needs: - - job: armv7l-debian-10-container - optional: true - allow_failure: false - variables: - CROSS: armv7l - JOB_OPTIONAL: 1 - NAME: debian-10 - - -i686-debian-10: - extends: .cross_build_job - needs: - - job: i686-debian-10-container - optional: true - allow_failure: true - variables: - CROSS: i686 - JOB_OPTIONAL: 1 - NAME: debian-10 - - -mips-debian-10: - extends: .cross_build_job - needs: - - job: mips-debian-10-container - optional: true - allow_failure: true - variables: - CROSS: mips - JOB_OPTIONAL: 1 - NAME: debian-10 - - -mips64el-debian-10: - extends: .cross_build_job - needs: - - job: mips64el-debian-10-container - optional: true - allow_failure: true - variables: - CROSS: mips64el - JOB_OPTIONAL: 1 - NAME: debian-10 - - -mipsel-debian-10: - extends: .cross_build_job - needs: - - job: mipsel-debian-10-container - optional: true - allow_failure: true - variables: - CROSS: mipsel - JOB_OPTIONAL: 1 - NAME: debian-10 - - -ppc64le-debian-10: - extends: .cross_build_job - needs: - - job: ppc64le-debian-10-container - optional: true - allow_failure: true - variables: - CROSS: ppc64le - JOB_OPTIONAL: 1 - NAME: debian-10 - - -s390x-debian-10: - extends: .cross_build_job - needs: - - job: s390x-debian-10-container - optional: true - allow_failure: true - variables: - CROSS: s390x - JOB_OPTIONAL: 1 - NAME: debian-10 - - aarch64-debian-11: extends: .cross_build_job needs: diff --git a/ci/gitlab/containers.yml b/ci/gitlab/containers.yml index b77baf509e..1b7f63955b 100644 --- a/ci/gitlab/containers.yml +++ b/ci/gitlab/containers.yml @@ -42,14 +42,6 @@ x86_64-centos-stream-9-container: NAME: centos-stream-9 -x86_64-debian-10-container: - extends: .container_job - allow_failure: false - variables: - JOB_OPTIONAL: 1 - NAME: debian-10 - - x86_64-debian-11-container: extends: .container_job allow_failure: false @@ -116,78 +108,6 @@ x86_64-ubuntu-2204-container: # Cross container jobs -aarch64-debian-10-container: - extends: .container_job - allow_failure: true - variables: - JOB_OPTIONAL: 1 - NAME: debian-10-cross-aarch64 - - -armv6l-debian-10-container: - extends: .container_job - allow_failure: true - variables: - JOB_OPTIONAL: 1 - NAME: debian-10-cross-armv6l - - -armv7l-debian-10-container: - extends: .container_job - allow_failure: false - variables: - JOB_OPTIONAL: 1 - NAME: debian-10-cross-armv7l - - -i686-debian-10-container: - extends: .container_job - allow_failure: true - variables: - JOB_OPTIONAL: 1 - NAME: debian-10-cross-i686 - - -mips-debian-10-container: - extends: .container_job - allow_failure: true - variables: - JOB_OPTIONAL: 1 - NAME: debian-10-cross-mips - - -mips64el-debian-10-container: - extends: .container_job - allow_failure: true - variables: - JOB_OPTIONAL: 1 - NAME: debian-10-cross-mips64el - - -mipsel-debian-10-container: - extends: .container_job - allow_failure: true - variables: - JOB_OPTIONAL: 1 - NAME: debian-10-cross-mipsel - - -ppc64le-debian-10-container: - extends: .container_job - allow_failure: true - variables: - JOB_OPTIONAL: 1 - NAME: debian-10-cross-ppc64le - - -s390x-debian-10-container: - extends: .container_job - allow_failure: true - variables: - JOB_OPTIONAL: 1 - NAME: debian-10-cross-s390x - - aarch64-debian-11-container: extends: .container_job allow_failure: false diff --git a/ci/manifest.yml b/ci/manifest.yml index 01dc5e4c9a..0baa82b0f8 100644 --- a/ci/manifest.yml +++ b/ci/manifest.yml @@ -44,46 +44,6 @@ targets: paths: - libvirt-rpms - debian-10: - jobs: - - arch: x86_64 - builds: false - - - arch: aarch64 - allow-failure: true - builds: false - - - arch: armv6l - allow-failure: true - builds: false - - - arch: armv7l - builds: false - - - arch: i686 - allow-failure: true - builds: false - - - arch: mips - allow-failure: true - builds: false - - - arch: mips64el - allow-failure: true - builds: false - - - arch: mipsel - allow-failure: true - builds: false - - - arch: ppc64le - allow-failure: true - builds: false - - - arch: s390x - allow-failure: true - builds: false - debian-11: jobs: - arch: x86_64 -- 2.36.1

On Fri, Jul 22, 2022 at 12:56:00PM +0200, Peter Krempa wrote:
Debian 10 reaches EOL in August of 2022.
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
While I don't have a serious issue with this patch which also conforms to our platform policy I don't think we need to always be so keen on dropping platforms ASAP manually. IOW I think all platform changes should be ideally be performed with lcitool, which however, won't be able to drop Debian 10 so soon sice QEMU will still likely rely on Debian 10 in their CI for a while unless matters around platform support have changed in QEMU??. Since you moved the CI workloads to Debian 11 in patch 2, leaving Debian 10 merely an optional job doesn't particularly harm anything. If nobody has any any objections against manually handling platform support rather than with lcitool, FWIW: # after the release Reviewed-by: Erik Skultety <eskultet@redhat.com>

On Mon, Jul 25, 2022 at 09:39:03AM +0200, Erik Skultety wrote:
On Fri, Jul 22, 2022 at 12:56:00PM +0200, Peter Krempa wrote:
Debian 10 reaches EOL in August of 2022.
While I don't have a serious issue with this patch which also conforms to our platform policy I don't think we need to always be so keen on dropping platforms ASAP manually. IOW I think all platform changes should be ideally be performed with lcitool, which however, won't be able to drop Debian 10 so soon sice QEMU will still likely rely on Debian 10 in their CI for a while unless matters around platform support have changed in QEMU??.
QEMU has the same platform support policy as libvirt these days, but their release schedule is different and that can result in keeping a target platform around for a few additional months. This influences how soon we can drop the platform in question from lcitool, but shouldn't affect libvirt: from libvirt's point of view, dropping a target platform is just a matter of updating the manifest, and there is no compelling reason to wait until lcitool has dropped support for it. If anything, it's more convenient to do it *before* that has happened, as in that case you can just run 'lcitool manifest' and have the tool dutifully delete the now-unused files for you instead of having to hunt them down manually :) -- Andrea Bolognani / Red Hat / Virtualization

On Fri, Jul 22, 2022 at 12:56:00PM +0200, Peter Krempa wrote:
Debian 10 reaches EOL in August of 2022.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../debian-10-cross-aarch64.Dockerfile | 125 ------------------ .../debian-10-cross-armv6l.Dockerfile | 124 ----------------- .../debian-10-cross-armv7l.Dockerfile | 125 ------------------ ci/containers/debian-10-cross-i686.Dockerfile | 124 ----------------- ci/containers/debian-10-cross-mips.Dockerfile | 124 ----------------- .../debian-10-cross-mips64el.Dockerfile | 124 ----------------- .../debian-10-cross-mipsel.Dockerfile | 124 ----------------- .../debian-10-cross-ppc64le.Dockerfile | 124 ----------------- .../debian-10-cross-s390x.Dockerfile | 124 ----------------- ci/containers/debian-10.Dockerfile | 105 --------------- ci/gitlab/builds.yml | 119 ----------------- ci/gitlab/containers.yml | 80 ----------- ci/manifest.yml | 40 ------ 13 files changed, 1462 deletions(-) delete mode 100644 ci/containers/debian-10-cross-aarch64.Dockerfile delete mode 100644 ci/containers/debian-10-cross-armv6l.Dockerfile delete mode 100644 ci/containers/debian-10-cross-armv7l.Dockerfile delete mode 100644 ci/containers/debian-10-cross-i686.Dockerfile delete mode 100644 ci/containers/debian-10-cross-mips.Dockerfile delete mode 100644 ci/containers/debian-10-cross-mips64el.Dockerfile delete mode 100644 ci/containers/debian-10-cross-mipsel.Dockerfile delete mode 100644 ci/containers/debian-10-cross-ppc64le.Dockerfile delete mode 100644 ci/containers/debian-10-cross-s390x.Dockerfile delete mode 100644 ci/containers/debian-10.Dockerfile
Reviewed-by: Andrea Bolognani <abologna@redhat.com> -- Andrea Bolognani / Red Hat / Virtualization

On a Friday in 2022, Peter Krempa wrote:
Alpine-314 was dropped by lcitool recently.
Debian-10 will reach EOL in August, so patches 2-3/3 should be pushed only after the upcoming release.
Pipeline: https://gitlab.com/pipo.sk/libvirt/-/pipelines/594315458
Peter Krempa (3): ci: Move builds from alpine-314 to alpine-315 ci: Move active Debian-10 jobs to Debian-11 ci: Drop Debian 10
ci/containers/alpine-314.Dockerfile | 81 ----------- .../debian-10-cross-aarch64.Dockerfile | 125 ----------------- .../debian-10-cross-armv6l.Dockerfile | 124 ----------------- .../debian-10-cross-armv7l.Dockerfile | 125 ----------------- ci/containers/debian-10-cross-i686.Dockerfile | 124 ----------------- ci/containers/debian-10-cross-mips.Dockerfile | 124 ----------------- .../debian-10-cross-mips64el.Dockerfile | 124 ----------------- .../debian-10-cross-mipsel.Dockerfile | 124 ----------------- .../debian-10-cross-ppc64le.Dockerfile | 124 ----------------- .../debian-10-cross-s390x.Dockerfile | 124 ----------------- ci/containers/debian-10.Dockerfile | 105 -------------- ci/gitlab.yml | 2 +- ci/gitlab/builds.yml | 130 ------------------ ci/gitlab/containers.yml | 87 ------------ ci/manifest.yml | 44 ------ 15 files changed, 1 insertion(+), 1566 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
participants (4)
-
Andrea Bolognani
-
Erik Skultety
-
Ján Tomko
-
Peter Krempa