From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Richard Henderson" <richard.henderson@linaro.org>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PULL 09/17] tests: Remove Ubuntu 20.04 container
Date: Wed, 24 Apr 2024 09:57:27 +0200 [thread overview]
Message-ID: <20240424075735.248041-10-thuth@redhat.com> (raw)
In-Reply-To: <20240424075735.248041-1-thuth@redhat.com>
Since Ubuntu 22.04 has now been available for more than two years, we
can stop actively supporting the previous LTS version of Ubuntu now.
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20240418101056.302103-2-thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/docker/dockerfiles/ubuntu2004.docker | 157 ---------------------
tests/lcitool/refresh | 1 -
2 files changed, 158 deletions(-)
delete mode 100644 tests/docker/dockerfiles/ubuntu2004.docker
diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dockerfiles/ubuntu2004.docker
deleted file mode 100644
index d3e212060c..0000000000
--- a/tests/docker/dockerfiles/ubuntu2004.docker
+++ /dev/null
@@ -1,157 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-# $ lcitool dockerfile --layers all ubuntu-2004 qemu
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-FROM docker.io/library/ubuntu:20.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 \
- bash \
- bc \
- bison \
- bsdmainutils \
- bzip2 \
- ca-certificates \
- ccache \
- clang \
- dbus \
- debianutils \
- diffutils \
- exuberant-ctags \
- findutils \
- flex \
- g++ \
- gcc \
- gcovr \
- gettext \
- git \
- hostname \
- libaio-dev \
- libasan6 \
- libasound2-dev \
- libattr1-dev \
- libbrlapi-dev \
- libbz2-dev \
- libc6-dev \
- libcacard-dev \
- libcap-ng-dev \
- libcapstone-dev \
- libcmocka-dev \
- libcurl4-gnutls-dev \
- libdaxctl-dev \
- libdrm-dev \
- libepoxy-dev \
- libfdt-dev \
- libffi-dev \
- libfuse3-dev \
- libgbm-dev \
- libgcrypt20-dev \
- libglib2.0-dev \
- libglusterfs-dev \
- libgnutls28-dev \
- libgtk-3-dev \
- libibumad-dev \
- libibverbs-dev \
- libiscsi-dev \
- libjemalloc-dev \
- libjpeg-turbo8-dev \
- libjson-c-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 \
- libslirp-dev \
- libsnappy-dev \
- libsndio-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 \
- mtools \
- multipath-tools \
- ncat \
- nettle-dev \
- ninja-build \
- openssh-client \
- 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 \
- socat \
- sparse \
- systemtap-sdt-dev \
- tar \
- tesseract-ocr \
- tesseract-ocr-eng \
- xfslibs-dev \
- xorriso \
- zlib1g-dev \
- zstd && \
- 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/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 /usr/bin/pip3 install \
- meson==0.63.2 \
- tomli
-
-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"
-# As a final step configure the user (if env is defined)
-ARG USER
-ARG UID
-RUN if [ "${USER}" ]; then \
- id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi
diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh
index fe7692c500..692752a3df 100755
--- a/tests/lcitool/refresh
+++ b/tests/lcitool/refresh
@@ -130,7 +130,6 @@ try:
trailer="".join(debian12_extras))
generate_dockerfile("fedora", "fedora-38")
generate_dockerfile("opensuse-leap", "opensuse-leap-15")
- generate_dockerfile("ubuntu2004", "ubuntu-2004")
generate_dockerfile("ubuntu2204", "ubuntu-2204")
#
--
2.44.0
next prev parent reply other threads:[~2024-04-24 7:58 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-24 7:57 [PULL 00/17] CI job updates, header cleanups and other misc patches Thomas Huth
2024-04-24 7:57 ` [PULL 01/17] MAINTAINERS: update email of Peter Lieven Thomas Huth
2024-04-24 7:57 ` [PULL 02/17] tests/qtest : Use `g_assert_cmphex` instead of `g_assert_cmpuint` Thomas Huth
2024-04-24 7:57 ` [PULL 03/17] docs: i386: pc: Update maximum CPU numbers for PC Q35 Thomas Huth
2024-04-24 7:57 ` [PULL 04/17] tests/vm: update openbsd image to 7.5 Thomas Huth
2024-04-24 7:57 ` [PULL 05/17] Revert ".travis.yml: Cache Avocado cache" Thomas Huth
2024-04-24 7:57 ` [PULL 06/17] .travis.yml: Remove the unused UNRELIABLE environment variable Thomas Huth
2024-04-24 7:57 ` [PULL 07/17] .travis.yml: Update the jobs to Ubuntu 22.04 Thomas Huth
2024-04-24 7:57 ` [PULL 08/17] .travis.yml: Do some more testing with Clang Thomas Huth
2024-04-24 7:57 ` Thomas Huth [this message]
2024-04-24 7:57 ` [PULL 10/17] tests/lcitool/libvirt-ci: Update to the latest master branch Thomas Huth
2024-04-24 7:57 ` [PULL 11/17] tests/docker/dockerfiles: Run lcitool-refresh after the lcitool update Thomas Huth
2024-04-24 7:57 ` [PULL 12/17] tests: Update our CI to use CentOS Stream 9 instead of 8 Thomas Huth
2024-04-24 16:19 ` Richard Henderson
2024-04-25 5:02 ` Thomas Huth
2024-04-24 7:57 ` [PULL 13/17] ci: move external build environment setups to CentOS Stream 9 Thomas Huth
2024-04-24 7:57 ` [PULL 14/17] hw/s390x: Include missing 'cpu.h' header Thomas Huth
2024-04-24 7:57 ` [PULL 15/17] docs/devel: fix minor typo in submitting-a-patch.rst Thomas Huth
2024-04-24 7:57 ` [PULL 16/17] tests/unit: Remove debug statements in test-nested-aio-poll.c Thomas Huth
2024-04-24 7:57 ` [PULL 17/17] target/s390x: Remove KVM stubs in cpu_models.h Thomas Huth
2024-04-24 16:21 ` [PULL 00/17] CI job updates, header cleanups and other misc patches Richard Henderson
2024-04-25 5:11 ` Thomas Huth
2024-04-25 7:55 ` Daniel P. Berrangé
2024-04-25 12:56 ` Fabiano Rosas
2024-04-25 15:04 ` Richard Henderson
2024-04-25 15:14 ` Thomas Huth
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240424075735.248041-10-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).