From nobody Mon Feb 9 22:24:05 2026 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1714985891843444.12647914689785; Mon, 6 May 2024 01:58:11 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id BCEEE1C32; Mon, 6 May 2024 04:58:10 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id C6CDA1C02; Mon, 6 May 2024 04:45:12 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 3C9441B91; Mon, 6 May 2024 04:45:10 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 1056E1B91 for ; Mon, 6 May 2024 04:43:19 -0400 (EDT) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-655-yeVZpLyGOqqfnu0GzLPEUg-1; Mon, 06 May 2024 04:43:17 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2F6283806737 for ; Mon, 6 May 2024 08:43:17 +0000 (UTC) Received: from maggie.brq.redhat.com (unknown [10.43.3.102]) by smtp.corp.redhat.com (Postfix) with ESMTP id CEF2140C6CC1 for ; Mon, 6 May 2024 08:43:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: yeVZpLyGOqqfnu0GzLPEUg-1 From: Michal Privoznik To: devel@lists.libvirt.org Subject: [PATCH 08/13] ci: Drop Ubuntu 20.04 Date: Mon, 6 May 2024 10:43:05 +0200 Message-ID: <0a72f15b2b8eaaf8356070b5560539552f6fd393.1714984263.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: LUHRUMQPM54K7VBHTYYY4A4V3PEOHNHT X-Message-ID-Hash: LUHRUMQPM54K7VBHTYYY4A4V3PEOHNHT X-MailFrom: mprivozn@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="utf-8"; x-default="true" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1714985892951100001 It's now more than two years since Ubuntu 22.04 was released and per our support policy, Ubuntu 20.04 (the previous major release) is now not supported. Remove it from our CI testing. Signed-off-by: Michal Privoznik Reviewed-by: Daniel P. Berrang=C3=A9 --- ci/buildenv/ubuntu-2004.sh | 103 -------------------------- ci/containers/ubuntu-2004.Dockerfile | 107 --------------------------- ci/gitlab/builds.yml | 28 ++----- ci/gitlab/containers.yml | 21 ++---- ci/manifest.yml | 8 -- 5 files changed, 14 insertions(+), 253 deletions(-) delete mode 100644 ci/buildenv/ubuntu-2004.sh delete mode 100644 ci/containers/ubuntu-2004.Dockerfile diff --git a/ci/buildenv/ubuntu-2004.sh b/ci/buildenv/ubuntu-2004.sh deleted file mode 100644 index e001fcf012..0000000000 --- a/ci/buildenv/ubuntu-2004.sh +++ /dev/null @@ -1,103 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool manifest ci/manifest.yml -# -# https://gitlab.com/libvirt/libvirt-ci - -function install_buildenv() { - export DEBIAN_FRONTEND=3Dnoninteractive - apt-get update - apt-get dist-upgrade -y - apt-get install --no-install-recommends -y \ - augeas-lenses \ - augeas-tools \ - bash-completion \ - black \ - 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 \ - 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 \ - libopenwsman-dev \ - libparted-dev \ - libpcap0.8-dev \ - libpciaccess-dev \ - librbd-dev \ - libreadline-dev \ - libsanlock-dev \ - libsasl2-dev \ - libselinux1-dev \ - libssh-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-pytest \ - python3-setuptools \ - python3-wheel \ - qemu-utils \ - sed \ - systemtap-sdt-dev \ - wireshark-dev \ - xsltproc - sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen - dpkg-reconfigure locales - rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED - dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt - mkdir -p /usr/libexec/ccache-wrappers - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc - /usr/bin/pip3 install meson=3D=3D0.56.0 -} - -export CCACHE_WRAPPERSDIR=3D"/usr/libexec/ccache-wrappers" -export LANG=3D"en_US.UTF-8" -export MAKE=3D"/usr/bin/make" -export NINJA=3D"/usr/bin/ninja" -export PYTHON=3D"/usr/bin/python3" diff --git a/ci/containers/ubuntu-2004.Dockerfile b/ci/containers/ubuntu-20= 04.Dockerfile deleted file mode 100644 index b43b85873e..0000000000 --- a/ci/containers/ubuntu-2004.Dockerfile +++ /dev/null @@ -1,107 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool manifest ci/manifest.yml -# -# https://gitlab.com/libvirt/libvirt-ci - -FROM docker.io/library/ubuntu:20.04 - -RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ - 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 \ - black \ - 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 \ - 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 \ - libopenwsman-dev \ - libparted-dev \ - libpcap0.8-dev \ - libpciaccess-dev \ - librbd-dev \ - libreadline-dev \ - libsanlock-dev \ - libsasl2-dev \ - libselinux1-dev \ - libssh-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-pytest \ - python3-setuptools \ - python3-wheel \ - qemu-utils \ - 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 && \ - rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED && \ - dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt && \ - mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc - -RUN /usr/bin/pip3 install meson=3D=3D0.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 --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml index e17d83710c..ffad94aea5 100644 --- a/ci/gitlab/builds.yml +++ b/ci/gitlab/builds.yml @@ -191,20 +191,6 @@ x86_64-opensuse-tumbleweed: TARGET_BASE_IMAGE: registry.opensuse.org/opensuse/tumbleweed:latest =20 =20 -x86_64-ubuntu-2004: - extends: .native_build_job - needs: - - job: x86_64-ubuntu-2004-container - optional: true - allow_failure: false - variables: - ASAN_OPTIONS: verify_asan_link_order=3D0 - MESON_ARGS: -Db_lundef=3Dfalse -Db_sanitize=3Daddress,undefined - NAME: ubuntu-2004 - TARGET_BASE_IMAGE: docker.io/library/ubuntu:20.04 - UBSAN_OPTIONS: print_stacktrace=3D1:halt_on_error=3D1 - - x86_64-ubuntu-2204: extends: .native_build_job needs: @@ -446,7 +432,7 @@ aarch64-debian-sid: needs: - job: aarch64-debian-sid-container optional: true - allow_failure: false + allow_failure: true variables: CROSS: aarch64 JOB_OPTIONAL: 1 @@ -459,7 +445,7 @@ armv6l-debian-sid: needs: - job: armv6l-debian-sid-container optional: true - allow_failure: false + allow_failure: true variables: CROSS: armv6l JOB_OPTIONAL: 1 @@ -472,7 +458,7 @@ armv7l-debian-sid: needs: - job: armv7l-debian-sid-container optional: true - allow_failure: false + allow_failure: true variables: CROSS: armv7l JOB_OPTIONAL: 1 @@ -485,7 +471,7 @@ i686-debian-sid: needs: - job: i686-debian-sid-container optional: true - allow_failure: false + allow_failure: true variables: CROSS: i686 JOB_OPTIONAL: 1 @@ -498,7 +484,7 @@ mips64el-debian-sid: needs: - job: mips64el-debian-sid-container optional: true - allow_failure: false + allow_failure: true variables: CROSS: mips64el JOB_OPTIONAL: 1 @@ -511,7 +497,7 @@ ppc64le-debian-sid: needs: - job: ppc64le-debian-sid-container optional: true - allow_failure: false + allow_failure: true variables: CROSS: ppc64le JOB_OPTIONAL: 1 @@ -524,7 +510,7 @@ s390x-debian-sid: needs: - job: s390x-debian-sid-container optional: true - allow_failure: false + allow_failure: true variables: CROSS: s390x JOB_OPTIONAL: 1 diff --git a/ci/gitlab/containers.yml b/ci/gitlab/containers.yml index 04516d8f55..75104d2486 100644 --- a/ci/gitlab/containers.yml +++ b/ci/gitlab/containers.yml @@ -85,13 +85,6 @@ x86_64-opensuse-tumbleweed-container: NAME: opensuse-tumbleweed =20 =20 -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 @@ -231,7 +224,7 @@ s390x-debian-12-container: =20 aarch64-debian-sid-container: extends: .container_job - allow_failure: false + allow_failure: true variables: JOB_OPTIONAL: 1 NAME: debian-sid-cross-aarch64 @@ -239,7 +232,7 @@ aarch64-debian-sid-container: =20 armv6l-debian-sid-container: extends: .container_job - allow_failure: false + allow_failure: true variables: JOB_OPTIONAL: 1 NAME: debian-sid-cross-armv6l @@ -247,7 +240,7 @@ armv6l-debian-sid-container: =20 armv7l-debian-sid-container: extends: .container_job - allow_failure: false + allow_failure: true variables: JOB_OPTIONAL: 1 NAME: debian-sid-cross-armv7l @@ -255,7 +248,7 @@ armv7l-debian-sid-container: =20 i686-debian-sid-container: extends: .container_job - allow_failure: false + allow_failure: true variables: JOB_OPTIONAL: 1 NAME: debian-sid-cross-i686 @@ -263,7 +256,7 @@ i686-debian-sid-container: =20 mips64el-debian-sid-container: extends: .container_job - allow_failure: false + allow_failure: true variables: JOB_OPTIONAL: 1 NAME: debian-sid-cross-mips64el @@ -271,7 +264,7 @@ mips64el-debian-sid-container: =20 ppc64le-debian-sid-container: extends: .container_job - allow_failure: false + allow_failure: true variables: JOB_OPTIONAL: 1 NAME: debian-sid-cross-ppc64le @@ -279,7 +272,7 @@ ppc64le-debian-sid-container: =20 s390x-debian-sid-container: extends: .container_job - allow_failure: false + allow_failure: true variables: JOB_OPTIONAL: 1 NAME: debian-sid-cross-s390x diff --git a/ci/manifest.yml b/ci/manifest.yml index d54276a25d..d51b7f7be1 100644 --- a/ci/manifest.yml +++ b/ci/manifest.yml @@ -204,14 +204,6 @@ targets: PATH_EXTRA: /usr/local/opt/ccache/libexec:/usr/local/opt/gettext= /bin:/usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin PKG_CONFIG_PATH: /usr/local/opt/curl/lib/pkgconfig:/usr/local/op= t/libpcap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt= /ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig =20 - ubuntu-2004: - jobs: - - arch: x86_64 - variables: - ASAN_OPTIONS: verify_asan_link_order=3D0 - MESON_ARGS: -Db_lundef=3Dfalse -Db_sanitize=3Daddress,undefined - UBSAN_OPTIONS: print_stacktrace=3D1:halt_on_error=3D1 - ubuntu-2204: jobs: - arch: x86_64 --=20 2.43.2 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org