[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 22/22] tests/docker: remove ubuntu container
From: |
Daniel P . Berrangé |
Subject: |
[PATCH v4 22/22] tests/docker: remove ubuntu container |
Date: |
Wed, 23 Jun 2021 15:29:10 +0100 |
This duplicates the ubuntu2004 container but with an inconsistent set of
packages.
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
.gitlab-ci.d/containers.yml | 5 --
tests/docker/dockerfiles/ubuntu.docker | 71 --------------------------
2 files changed, 76 deletions(-)
delete mode 100644 tests/docker/dockerfiles/ubuntu.docker
diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml
index cd06d3f5f4..b9b675fdcb 100644
--- a/.gitlab-ci.d/containers.yml
+++ b/.gitlab-ci.d/containers.yml
@@ -29,11 +29,6 @@ amd64-ubuntu2004-container:
variables:
NAME: ubuntu2004
-amd64-ubuntu-container:
- extends: .container_job_template
- variables:
- NAME: ubuntu
-
amd64-opensuse-leap-container:
extends: .container_job_template
variables:
diff --git a/tests/docker/dockerfiles/ubuntu.docker
b/tests/docker/dockerfiles/ubuntu.docker
deleted file mode 100644
index f0e0180d21..0000000000
--- a/tests/docker/dockerfiles/ubuntu.docker
+++ /dev/null
@@ -1,71 +0,0 @@
-#
-# Latest Ubuntu Release
-#
-# Useful for testing against relatively bleeding edge libraries and
-# compilers. We also have seperate recipe for the most recent LTS
-# release.
-#
-# When updating use the full tag not :latest otherwise the build
-# system won't pick up that it has changed.
-#
-
-FROM docker.io/library/ubuntu:20.04
-ENV PACKAGES \
- ccache \
- clang \
- dbus \
- gcc \
- gettext \
- git \
- glusterfs-common \
- libaio-dev \
- libattr1-dev \
- libbrlapi-dev \
- libbz2-dev \
- libcacard-dev \
- libcap-ng-dev \
- libcurl4-gnutls-dev \
- libdrm-dev \
- libepoxy-dev \
- libfdt-dev \
- libffi-dev \
- libgbm-dev \
- libgnutls28-dev \
- libgtk-3-dev \
- libibverbs-dev \
- libiscsi-dev \
- libjemalloc-dev \
- libjpeg-turbo8-dev \
- liblzo2-dev \
- libncurses5-dev \
- libncursesw5-dev \
- libnfs-dev \
- libnuma-dev \
- libpixman-1-dev \
- libpng-dev \
- librados-dev \
- librbd-dev \
- librdmacm-dev \
- libsasl2-dev \
- libsdl2-dev \
- libseccomp-dev \
- libsnappy-dev \
- libspice-protocol-dev \
- libspice-server-dev \
- libssh-dev \
- libusb-1.0-0-dev \
- libusbredirhost-dev \
- libvdeplug-dev \
- libvte-2.91-dev \
- libxen-dev \
- libzstd-dev \
- make \
- ninja-build \
- python3-yaml \
- python3-sphinx \
- python3-sphinx-rtd-theme \
- sparse \
- xfslibs-dev
-RUN apt-get update && \
- DEBIAN_FRONTEND=noninteractive apt-get -y install $PACKAGES
-RUN dpkg -l $PACKAGES | sort > /packages.txt
--
2.31.1
- [PATCH v4 12/22] tests/docker: expand fedora package list, (continued)
- [PATCH v4 12/22] tests/docker: expand fedora package list, Daniel P . Berrangé, 2021/06/23
- [PATCH v4 13/22] tests/docker: expand ubuntu1804 package list, Daniel P . Berrangé, 2021/06/23
- [PATCH v4 14/22] tests/docker: expand ubuntu2004 package list, Daniel P . Berrangé, 2021/06/23
- [PATCH v4 15/22] tests/docker: expand opensuse-leap package list, Daniel P . Berrangé, 2021/06/23
- [PATCH v4 16/22] tests/docker: add script for automating container refresh, Daniel P . Berrangé, 2021/06/23
- [PATCH v4 17/22] tests/docker: auto-generate centos8 with lcitool, Daniel P . Berrangé, 2021/06/23
- [PATCH v4 18/22] tests/docker: auto-generate fedora with lcitool, Daniel P . Berrangé, 2021/06/23
- [PATCH v4 19/22] tests/docker: auto-generate ubuntu1804 with lcitool, Daniel P . Berrangé, 2021/06/23
- [PATCH v4 20/22] tests/docker: auto-generate ubuntu2004 with lcitool, Daniel P . Berrangé, 2021/06/23
- [PATCH v4 21/22] tests/docker: auto-generate opensuse-leap with lcitool, Daniel P . Berrangé, 2021/06/23
- [PATCH v4 22/22] tests/docker: remove ubuntu container,
Daniel P . Berrangé <=
- Re: [PATCH v4 00/22] tests/docker: start using libvirt-ci's "lcitool" for dockerfiles, no-reply, 2021/06/23