From f3f0cbaf97c78b1fc1f3855f576e46ea6ad4f34c Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Mon, 16 May 2022 13:59:12 +0200 Subject: Remove Ubuntu 18.04 container support from the repository MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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. Message-Id: <20220516115912.120951-1-thuth@redhat.com> Reviewed-by: Daniel P. Berrangé Signed-off-by: Thomas Huth --- scripts/ci/setup/build-environment.yml | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'scripts/ci/setup') diff --git a/scripts/ci/setup/build-environment.yml b/scripts/ci/setup/build-environment.yml index 9182e0c..232525b 100644 --- a/scripts/ci/setup/build-environment.yml +++ b/scripts/ci/setup/build-environment.yml @@ -33,10 +33,9 @@ when: - ansible_facts['distribution'] == 'Ubuntu' - - 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'] == 'Ubuntu' - - name: Install packages to build QEMU on Ubuntu 18.04/20.04 on non-s390x + - 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'] == 'Ubuntu' - ansible_facts['architecture'] != 's390x' - - 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'] == 'Ubuntu' - - ansible_facts['distribution_version'] == '18.04' - - name: Install basic packages to build QEMU on Ubuntu 20.04 package: name: -- cgit v1.1