Remove Ubuntu 18.04 conatiner support from the repository
PATCH v2 1/1 Remove Ubuntu 18.04 conatiner support from the repository
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.
---
v2: Omit the VM images from tests/vm/ for now, Philippe wants to rework them
.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
.gitlab-ci.d/containers.yml +0 -5
@@ -19,11 +19,6 @@ amd64-debian-container: variables: NAME: debian-amd64 -amd64-ubuntu1804-container: - extends: .container_job_template - variables: - NAME: ubuntu1804 - amd64-ubuntu2004-container: extends: .container_job_template variables:
.gitlab-ci.d/custom-runners/ubuntu-20.04-aarch32.yml +1 -1
@@ -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" ubuntu-20.04-aarch32-all: needs: []
.gitlab-ci.d/custom-runners/ubuntu-20.04-aarch64.yml +1 -1
@@ -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" ubuntu-20.04-aarch64-all-linux-static: needs: []
scripts/ci/setup/build-environment.yml +2 -12
@@ -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:
tests/docker/dockerfiles/ubuntu1804.docker deleted +0 -144
144 lines not on this page · raw message
tests/lcitool/refresh +0 -7
@@ -65,11 +65,6 @@ def generate_cirrus(target, trailer=None): cmd = lcitool_cmd + ["variables", target, "qemu"] generate(filename, cmd, trailer) -ubuntu1804_skipssh = [ - "# https://bugs.launchpad.net/qemu/+bug/1838763\n", - "ENV QEMU_CONFIGURE_OPTS --disable-libssh\n" -] - ubuntu2004_tsanhack = [ "# 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="".join(ubuntu1804_skipssh)) generate_dockerfile("ubuntu2004", "ubuntu-2004", trailer="".join(ubuntu2004_tsanhack)) generate_dockerfile("opensuse-leap", "opensuse-leap-152")
Signature · 1 line
2.27.0
Quoted 8 lines · Thomas Huth
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 <[email protected]>---
v2: Omit the VM images from tests/vm/ for now, Philippe wants to rework them
Quoted 8 lines
.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
With regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Quoted 6 lines · Thomas Huth
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 <[email protected]>
minor nit: typo in subject: "container"
thanks
-- PMm