From nobody Thu May 2 02:49:00 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1652706235; cv=none; d=zohomail.com; s=zohoarc; b=WKmWgiF27TVK/BtDQHKSqfu1WzMjA27JctCvFPP2nDWD+6LEViIgoz03NLIq7IqnNTVQ+zZ+Ubu7rSAz0/EfY+MxCYef1t+RrNGZkr9RKnz8qz01aZhs1oXNSIWK1gQ/aQE+OujqQNInPTYgm3O27mjqzMzalGsbeBNHD34vN3Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652706235; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=jq9hKqxsHG1rVLFeF4O7pfW45PWvz9ffZvBmxOKwEYk=; b=ZBGAXjIt11ua/CAPwiCuIKKJUHGTKWYkmJdQtqR0S5cUK+JuLvhR3EkhKFypRCH+5F9YC9LLvycf+Gy/Zu/1v/cZypBw5PBjs/gmzxNEUhm7l6zePlPN2Co/q24a8auHvjrm/zmyZdyvZd06PoA1jqlWlGpZ9DIYdqoaLKRwe2I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1652706235496135.02461185259313; Mon, 16 May 2022 06:03:55 -0700 (PDT) Received: from localhost ([::1]:45102 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nqaOA-0000FW-27 for importer2@patchew.org; Mon, 16 May 2022 09:03:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36522) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqZNn-0006Go-Nt for qemu-devel@nongnu.org; Mon, 16 May 2022 07:59:27 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:45281) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqZNk-0002Ps-PO for qemu-devel@nongnu.org; Mon, 16 May 2022 07:59:26 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-348-NIpxjvJ4Ou61vdx563yxvA-1; Mon, 16 May 2022 07:59:18 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 12ABD80A0AD; Mon, 16 May 2022 11:59:18 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.239]) by smtp.corp.redhat.com (Postfix) with ESMTP id D1FCB14DE226; Mon, 16 May 2022 11:59:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652702361; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=jq9hKqxsHG1rVLFeF4O7pfW45PWvz9ffZvBmxOKwEYk=; b=Ev212AqodEnKiygUVQH2GOwlokHO2Ip0CQ0iAuJxnWPv72q43xTM2f+NG9P12BT/KJjlMf qWBpJNDtL+1bC4oXdB9auorK8isNawWiD6maspP3exrv8DAvPuKk4ktAQDQW2CelfC96xJ P9z3mhSLjQPebWmN0BWYsipQuLhGhH0= X-MC-Unique: NIpxjvJ4Ou61vdx563yxvA-1 From: Thomas Huth To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Fam Zheng , Heinrich Schuchardt , Christian Ehrhardt Subject: [PATCH v2] Remove Ubuntu 18.04 conatiner support from the repository Date: Mon, 16 May 2022 13:59:12 +0200 Message-Id: <20220516115912.120951-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_FILL_THIS_FORM_SHORT=0.01, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1652706236354100001 Content-Type: text/plain; charset="utf-8" According to our "Supported build platforms" policy, we now do not support Ubuntu 18.04 anymore. Remove the related container files and entries from our CI. Signed-off-by: Thomas Huth Reviewed-by: Daniel P. Berrang=C3=A9 --- v2: Omit the VM images from tests/vm/ for now, Philippe wants to rework th= em .gitlab-ci.d/containers.yml | 5 - .../custom-runners/ubuntu-20.04-aarch32.yml | 2 +- .../custom-runners/ubuntu-20.04-aarch64.yml | 2 +- scripts/ci/setup/build-environment.yml | 14 +- tests/docker/dockerfiles/ubuntu1804.docker | 144 ------------------ tests/lcitool/refresh | 7 - 6 files changed, 4 insertions(+), 170 deletions(-) delete mode 100644 tests/docker/dockerfiles/ubuntu1804.docker diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml index b9b675fdcb..e9df90bbdd 100644 --- a/.gitlab-ci.d/containers.yml +++ b/.gitlab-ci.d/containers.yml @@ -19,11 +19,6 @@ amd64-debian-container: variables: NAME: debian-amd64 =20 -amd64-ubuntu1804-container: - extends: .container_job_template - variables: - NAME: ubuntu1804 - amd64-ubuntu2004-container: extends: .container_job_template variables: diff --git a/.gitlab-ci.d/custom-runners/ubuntu-20.04-aarch32.yml b/.gitlab= -ci.d/custom-runners/ubuntu-20.04-aarch32.yml index 9c589bc4cf..47856ac53c 100644 --- a/.gitlab-ci.d/custom-runners/ubuntu-20.04-aarch32.yml +++ b/.gitlab-ci.d/custom-runners/ubuntu-20.04-aarch32.yml @@ -1,6 +1,6 @@ # All ubuntu-20.04 jobs should run successfully in an environment # setup by the scripts/ci/setup/qemu/build-environment.yml task -# "Install basic packages to build QEMU on Ubuntu 18.04/20.04" +# "Install basic packages to build QEMU on Ubuntu 20.04" =20 ubuntu-20.04-aarch32-all: needs: [] diff --git a/.gitlab-ci.d/custom-runners/ubuntu-20.04-aarch64.yml b/.gitlab= -ci.d/custom-runners/ubuntu-20.04-aarch64.yml index 920e388bd0..951e490db1 100644 --- a/.gitlab-ci.d/custom-runners/ubuntu-20.04-aarch64.yml +++ b/.gitlab-ci.d/custom-runners/ubuntu-20.04-aarch64.yml @@ -1,6 +1,6 @@ # All ubuntu-20.04 jobs should run successfully in an environment # setup by the scripts/ci/setup/qemu/build-environment.yml task -# "Install basic packages to build QEMU on Ubuntu 18.04/20.04" +# "Install basic packages to build QEMU on Ubuntu 20.04" =20 ubuntu-20.04-aarch64-all-linux-static: needs: [] diff --git a/scripts/ci/setup/build-environment.yml b/scripts/ci/setup/buil= d-environment.yml index 9182e0c253..232525b91d 100644 --- a/scripts/ci/setup/build-environment.yml +++ b/scripts/ci/setup/build-environment.yml @@ -33,10 +33,9 @@ when: - ansible_facts['distribution'] =3D=3D 'Ubuntu' =20 - - name: Install basic packages to build QEMU on Ubuntu 18.04/20.04 + - name: Install basic packages to build QEMU on Ubuntu 20.04 package: name: - # Originally from tests/docker/dockerfiles/ubuntu1804.docker - ccache - gcc - gettext @@ -90,7 +89,7 @@ when: - ansible_facts['distribution'] =3D=3D 'Ubuntu' =20 - - name: Install packages to build QEMU on Ubuntu 18.04/20.04 on non-s3= 90x + - name: Install packages to build QEMU on Ubuntu 20.04 on non-s390x package: name: - libspice-server-dev @@ -100,15 +99,6 @@ - ansible_facts['distribution'] =3D=3D 'Ubuntu' - ansible_facts['architecture'] !=3D 's390x' =20 - - name: Install basic packages to build QEMU on Ubuntu 18.04 - package: - name: - # Originally from tests/docker/dockerfiles/ubuntu1804.docker - - clang - when: - - ansible_facts['distribution'] =3D=3D 'Ubuntu' - - ansible_facts['distribution_version'] =3D=3D '18.04' - - name: Install basic packages to build QEMU on Ubuntu 20.04 package: name: diff --git a/tests/docker/dockerfiles/ubuntu1804.docker b/tests/docker/dock= erfiles/ubuntu1804.docker deleted file mode 100644 index b3f2156580..0000000000 --- a/tests/docker/dockerfiles/ubuntu1804.docker +++ /dev/null @@ -1,144 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool dockerfile --layers all ubuntu-1804 qemu -# -# https://gitlab.com/libvirt/libvirt-ci - -FROM docker.io/library/ubuntu:18.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 \ - bash \ - bc \ - bsdmainutils \ - bzip2 \ - ca-certificates \ - ccache \ - clang \ - dbus \ - debianutils \ - diffutils \ - exuberant-ctags \ - findutils \ - g++ \ - gcc \ - gcovr \ - genisoimage \ - gettext \ - git \ - glusterfs-common \ - hostname \ - libaio-dev \ - libasan5 \ - libasound2-dev \ - libattr1-dev \ - libbrlapi-dev \ - libbz2-dev \ - libc6-dev \ - libcacard-dev \ - libcap-ng-dev \ - libcapstone-dev \ - libcurl4-gnutls-dev \ - libdaxctl-dev \ - libdrm-dev \ - libepoxy-dev \ - libfdt-dev \ - libffi-dev \ - libgbm-dev \ - libgcrypt20-dev \ - libglib2.0-dev \ - libgnutls28-dev \ - libgtk-3-dev \ - libibumad-dev \ - libibverbs-dev \ - libiscsi-dev \ - libjemalloc-dev \ - libjpeg-turbo8-dev \ - liblttng-ust-dev \ - liblzo2-dev \ - libncursesw5-dev \ - libnfs-dev \ - libnuma-dev \ - libpam0g-dev \ - libpcre2-dev \ - libpixman-1-dev \ - libpmem-dev \ - libpng-dev \ - libpulse-dev \ - librbd-dev \ - librdmacm-dev \ - libsasl2-dev \ - libsdl2-dev \ - libsdl2-image-dev \ - libseccomp-dev \ - libselinux1-dev \ - libsnappy-dev \ - libspice-protocol-dev \ - libspice-server-dev \ - libssh-dev \ - libsystemd-dev \ - libtasn1-6-dev \ - libubsan1 \ - libudev-dev \ - libusb-1.0-0-dev \ - libusbredirhost-dev \ - libvdeplug-dev \ - libvirglrenderer-dev \ - libvte-2.91-dev \ - libxen-dev \ - libzstd-dev \ - llvm \ - locales \ - make \ - multipath-tools \ - netcat-openbsd \ - nettle-dev \ - ninja-build \ - openssh-client \ - perl-base \ - pkgconf \ - python3 \ - python3-numpy \ - python3-opencv \ - python3-pillow \ - python3-pip \ - python3-setuptools \ - python3-sphinx \ - python3-sphinx-rtd-theme \ - python3-venv \ - python3-wheel \ - python3-yaml \ - rpm2cpio \ - sed \ - sparse \ - systemtap-sdt-dev \ - tar \ - tesseract-ocr \ - tesseract-ocr-eng \ - texinfo \ - xfslibs-dev \ - zlib1g-dev && \ - 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' --sh= ow > /packages.txt && \ - mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/c++ && \ - 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/g++ && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc - -RUN pip3 install meson=3D=3D0.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" -# https://bugs.launchpad.net/qemu/+bug/1838763 -ENV QEMU_CONFIGURE_OPTS --disable-libssh diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index 2d198ad281..fb49bbc441 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -65,11 +65,6 @@ def generate_cirrus(target, trailer=3DNone): cmd =3D lcitool_cmd + ["variables", target, "qemu"] generate(filename, cmd, trailer) =20 -ubuntu1804_skipssh =3D [ - "# https://bugs.launchpad.net/qemu/+bug/1838763\n", - "ENV QEMU_CONFIGURE_OPTS --disable-libssh\n" -] - ubuntu2004_tsanhack =3D [ "# Apply patch https://reviews.llvm.org/D75820\n", "# This is required for TSan in clang-10 to compile with QEMU.\n", @@ -85,8 +80,6 @@ def debian_cross_build(prefix, targets): try: generate_dockerfile("centos8", "centos-stream-8") generate_dockerfile("fedora", "fedora-35") - generate_dockerfile("ubuntu1804", "ubuntu-1804", - trailer=3D"".join(ubuntu1804_skipssh)) generate_dockerfile("ubuntu2004", "ubuntu-2004", trailer=3D"".join(ubuntu2004_tsanhack)) generate_dockerfile("opensuse-leap", "opensuse-leap-152") --=20 2.27.0