7:47 a.m.
As of April 23 2022, Ubuntu 20.04 will be out for two years, which per
our platform support policy means we no longer have to support
Ubuntu 18.04.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
ci/containers/ubuntu-1804.Dockerfile | 108 ---------------------------
ci/gitlab.yml | 16 ----
ci/manifest.yml | 2 -
3 files changed, 126 deletions(-)
delete mode 100644 ci/containers/ubuntu-1804.Dockerfile
diff --git a/ci/containers/ubuntu-1804.Dockerfile b/ci/containers/ubuntu-1804.Dockerfile
deleted file mode 100644
index 5e9f90cdba..0000000000
--- a/ci/containers/ubuntu-1804.Dockerfile
+++ /dev/null
@@ -1,108 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-# $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-FROM docker.io/library/ubuntu:18.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 \
- augeas-lenses \
- augeas-tools \
- bash-completion \
- ca-certificates \
- ccache \
- clang \
- codespell \
- cpp \
- diffutils \
- dnsmasq-base \
- dwarves \
- ebtables \
- flake8 \
- gcc \
- gettext \
- git \
- glusterfs-common \
- 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 \
- 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-setuptools \
- python3-wheel \
- qemu-utils \
- scrub \
- sed \
- sheepdog \
- 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.yml b/ci/gitlab.yml
index cc03a2fe49..cc201457a6 100644
--- a/ci/gitlab.yml
+++ b/ci/gitlab.yml
@@ -157,13 +157,6 @@ x86_64-opensuse-tumbleweed-container:
NAME: opensuse-tumbleweed
-x86_64-ubuntu-1804-container:
- extends: .container_job
- allow_failure: false
- variables:
- NAME: ubuntu-1804
-
-
x86_64-ubuntu-2004-container:
extends: .container_job
allow_failure: false
@@ -512,15 +505,6 @@ x86_64-opensuse-tumbleweed:
RPM: skip
-x86_64-ubuntu-1804:
- extends: .native_build_job
- needs:
- - x86_64-ubuntu-1804-container
- allow_failure: false
- variables:
- NAME: ubuntu-1804
-
-
x86_64-ubuntu-2004:
extends: .native_build_job
needs:
diff --git a/ci/manifest.yml b/ci/manifest.yml
index 87d923ae78..e4e52e5256 100644
--- a/ci/manifest.yml
+++ b/ci/manifest.yml
@@ -187,8 +187,6 @@ targets:
PATH_EXTRA:
/usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin:/usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin:/usr/local/opt/rpcgen/bin
PKG_CONFIG_PATH:
/usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/libpcap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig
- ubuntu-1804: x86_64
-
ubuntu-2004:
jobs:
- arch: x86_64
--
2.34.1