diff --git a/tools/update-test-platforms.py b/tools/update-test-platforms.py index 52b8ae66c..5d948e1c2 100755 --- a/tools/update-test-platforms.py +++ b/tools/update-test-platforms.py @@ -40,7 +40,6 @@ PLATFORMS = [ 'opensuse-15', 'opensuse-tumbleweed', 'ubuntu-bionic', - 'ubuntu-xenial', 'ubuntu-focal', ] diff --git a/zuul-tests.d/container-roles-jobs.yaml b/zuul-tests.d/container-roles-jobs.yaml index d56506a47..aa0174c26 100644 --- a/zuul-tests.d/container-roles-jobs.yaml +++ b/zuul-tests.d/container-roles-jobs.yaml @@ -44,15 +44,6 @@ - name: ubuntu-bionic label: ubuntu-bionic -- job: - name: zuul-jobs-test-ensure-docker-ubuntu-xenial - description: Tests ensure-docker role on ubuntu-xenial - parent: zuul-jobs-test-ensure-docker - nodeset: - nodes: - - name: ubuntu-xenial - label: ubuntu-xenial - - job: name: zuul-jobs-test-build-container-image-release description: | @@ -469,7 +460,6 @@ - zuul-jobs-test-ensure-docker-centos-8 - zuul-jobs-test-ensure-docker-debian-stretch - zuul-jobs-test-ensure-docker-ubuntu-bionic - - zuul-jobs-test-ensure-docker-ubuntu-xenial - zuul-jobs-test-build-container-image-release - zuul-jobs-test-build-docker-image-release - zuul-jobs-test-build-docker-image-release-multiarch @@ -496,7 +486,6 @@ - zuul-jobs-test-ensure-docker-centos-8 - zuul-jobs-test-ensure-docker-debian-stretch - zuul-jobs-test-ensure-docker-ubuntu-bionic - - zuul-jobs-test-ensure-docker-ubuntu-xenial - zuul-jobs-test-build-container-image-release - zuul-jobs-test-build-docker-image-release - zuul-jobs-test-build-docker-image-release-multiarch diff --git a/zuul-tests.d/general-roles-jobs.yaml b/zuul-tests.d/general-roles-jobs.yaml index d27deff22..41eba4f4e 100644 --- a/zuul-tests.d/general-roles-jobs.yaml +++ b/zuul-tests.d/general-roles-jobs.yaml @@ -215,16 +215,6 @@ - name: ubuntu-bionic label: ubuntu-bionic -- job: - name: zuul-jobs-test-base-roles-ubuntu-xenial - description: Tests roles in the 'base' job on ubuntu-xenial - parent: zuul-jobs-test-base-roles - tags: auto-generated - nodeset: - nodes: - - name: ubuntu-xenial - label: ubuntu-xenial - - job: name: zuul-jobs-test-base-roles-ubuntu-focal description: Tests roles in the 'base' job on ubuntu-focal @@ -339,16 +329,6 @@ - name: ubuntu-bionic label: ubuntu-bionic -- job: - name: zuul-jobs-test-bindep-ubuntu-xenial - description: Test the bindep role on ubuntu-xenial - parent: zuul-jobs-test-bindep - tags: auto-generated - nodeset: - nodes: - - name: ubuntu-xenial - label: ubuntu-xenial - - job: name: zuul-jobs-test-bindep-ubuntu-focal description: Test the bindep role on ubuntu-focal @@ -601,25 +581,6 @@ nodes: - secondary -- job: - name: zuul-jobs-test-multinode-roles-ubuntu-xenial - description: Tests multinode setup roles on ubuntu-xenial - parent: zuul-jobs-test-multinode-roles - tags: auto-generated - nodeset: - nodes: - - name: primary - label: ubuntu-xenial - - name: secondary - label: ubuntu-xenial - groups: - - name: switch - nodes: - - primary - - name: peers - nodes: - - secondary - - job: name: zuul-jobs-test-multinode-roles-ubuntu-focal description: Tests multinode setup roles on ubuntu-focal @@ -748,7 +709,6 @@ - zuul-jobs-test-base-roles-opensuse-15 - zuul-jobs-test-base-roles-opensuse-tumbleweed-nv - zuul-jobs-test-base-roles-ubuntu-bionic - - zuul-jobs-test-base-roles-ubuntu-xenial - zuul-jobs-test-base-roles-ubuntu-focal - zuul-jobs-test-bindep-centos-7 - zuul-jobs-test-bindep-centos-8 @@ -759,7 +719,6 @@ - zuul-jobs-test-bindep-opensuse-15 - zuul-jobs-test-bindep-opensuse-tumbleweed-nv - zuul-jobs-test-bindep-ubuntu-bionic - - zuul-jobs-test-bindep-ubuntu-xenial - zuul-jobs-test-bindep-ubuntu-focal - zuul-jobs-test-clear-firewall - zuul-jobs-test-enable-fips @@ -775,7 +734,6 @@ - zuul-jobs-test-multinode-roles-opensuse-15 - zuul-jobs-test-multinode-roles-opensuse-tumbleweed-nv - zuul-jobs-test-multinode-roles-ubuntu-bionic - - zuul-jobs-test-multinode-roles-ubuntu-xenial - zuul-jobs-test-multinode-roles-ubuntu-focal - zuul-jobs-test-generate-zuul-manifest - zuul-jobs-test-upload-artifactory @@ -799,7 +757,6 @@ - zuul-jobs-test-base-roles-fedora-34 - zuul-jobs-test-base-roles-opensuse-15 - zuul-jobs-test-base-roles-ubuntu-bionic - - zuul-jobs-test-base-roles-ubuntu-xenial - zuul-jobs-test-base-roles-ubuntu-focal - zuul-jobs-test-bindep-centos-7 - zuul-jobs-test-bindep-centos-8 @@ -809,7 +766,6 @@ - zuul-jobs-test-bindep-fedora-34 - zuul-jobs-test-bindep-opensuse-15 - zuul-jobs-test-bindep-ubuntu-bionic - - zuul-jobs-test-bindep-ubuntu-xenial - zuul-jobs-test-bindep-ubuntu-focal - zuul-jobs-test-clear-firewall - zuul-jobs-test-enable-fips @@ -824,7 +780,6 @@ - zuul-jobs-test-multinode-roles-fedora-34 - zuul-jobs-test-multinode-roles-opensuse-15 - zuul-jobs-test-multinode-roles-ubuntu-bionic - - zuul-jobs-test-multinode-roles-ubuntu-xenial - zuul-jobs-test-multinode-roles-ubuntu-focal - zuul-jobs-test-generate-zuul-manifest - zuul-jobs-test-upload-artifactory diff --git a/zuul-tests.d/go-jobs.yaml b/zuul-tests.d/go-jobs.yaml index e4a0dac28..67e238385 100644 --- a/zuul-tests.d/go-jobs.yaml +++ b/zuul-tests.d/go-jobs.yaml @@ -106,16 +106,6 @@ - name: ubuntu-bionic label: ubuntu-bionic -- job: - name: zuul-jobs-test-golang-go-ubuntu-xenial - description: Test the golang-go job on ubuntu-xenial - parent: zuul-jobs-test-golang-go - tags: auto-generated - nodeset: - nodes: - - name: ubuntu-xenial - label: ubuntu-xenial - - job: name: zuul-jobs-test-golang-go-ubuntu-focal description: Test the golang-go job on ubuntu-focal @@ -138,7 +128,6 @@ - zuul-jobs-test-golang-go-opensuse-15 - zuul-jobs-test-golang-go-opensuse-tumbleweed-nv - zuul-jobs-test-golang-go-ubuntu-bionic - - zuul-jobs-test-golang-go-ubuntu-xenial - zuul-jobs-test-golang-go-ubuntu-focal gate: jobs: &id001 @@ -150,7 +139,6 @@ - zuul-jobs-test-golang-go-fedora-34 - zuul-jobs-test-golang-go-opensuse-15 - zuul-jobs-test-golang-go-ubuntu-bionic - - zuul-jobs-test-golang-go-ubuntu-xenial - zuul-jobs-test-golang-go-ubuntu-focal periodic-weekly: jobs: *id001 diff --git a/zuul-tests.d/nim-jobs.yaml b/zuul-tests.d/nim-jobs.yaml index 64dc2b8cd..c49804de5 100644 --- a/zuul-tests.d/nim-jobs.yaml +++ b/zuul-tests.d/nim-jobs.yaml @@ -104,16 +104,6 @@ - name: ubuntu-bionic label: ubuntu-bionic -- job: - name: zuul-jobs-test-nimble-ubuntu-xenial - description: Test the nimble job on ubuntu-xenial - parent: zuul-jobs-test-nimble - tags: auto-generated - nodeset: - nodes: - - name: ubuntu-xenial - label: ubuntu-xenial - - job: name: zuul-jobs-test-nimble-ubuntu-focal description: Test the nimble job on ubuntu-focal @@ -136,7 +126,6 @@ - zuul-jobs-test-nimble-opensuse-15 - zuul-jobs-test-nimble-opensuse-tumbleweed-nv - zuul-jobs-test-nimble-ubuntu-bionic - - zuul-jobs-test-nimble-ubuntu-xenial - zuul-jobs-test-nimble-ubuntu-focal gate: jobs: &id001 @@ -148,7 +137,6 @@ - zuul-jobs-test-nimble-fedora-34 - zuul-jobs-test-nimble-opensuse-15 - zuul-jobs-test-nimble-ubuntu-bionic - - zuul-jobs-test-nimble-ubuntu-xenial - zuul-jobs-test-nimble-ubuntu-focal periodic-weekly: jobs: *id001 diff --git a/zuul-tests.d/packer-jobs.yaml b/zuul-tests.d/packer-jobs.yaml index 3dcd2004d..b518d4058 100644 --- a/zuul-tests.d/packer-jobs.yaml +++ b/zuul-tests.d/packer-jobs.yaml @@ -108,16 +108,6 @@ - name: ubuntu-bionic label: ubuntu-bionic -- job: - name: zuul-jobs-test-packer-ubuntu-xenial - description: Test packer job on ubuntu-xenial - parent: zuul-jobs-test-packer - tags: auto-generated - nodeset: - nodes: - - name: ubuntu-xenial - label: ubuntu-xenial - - job: name: zuul-jobs-test-packer-ubuntu-focal description: Test packer job on ubuntu-focal @@ -140,7 +130,6 @@ - zuul-jobs-test-packer-opensuse-15 - zuul-jobs-test-packer-opensuse-tumbleweed-nv - zuul-jobs-test-packer-ubuntu-bionic - - zuul-jobs-test-packer-ubuntu-xenial - zuul-jobs-test-packer-ubuntu-focal gate: jobs: &id001 @@ -152,7 +141,6 @@ - zuul-jobs-test-packer-fedora-34 - zuul-jobs-test-packer-opensuse-15 - zuul-jobs-test-packer-ubuntu-bionic - - zuul-jobs-test-packer-ubuntu-xenial - zuul-jobs-test-packer-ubuntu-focal periodic-weekly: jobs: *id001 diff --git a/zuul-tests.d/project.yaml b/zuul-tests.d/project.yaml index 7d6437cfe..eedd69178 100644 --- a/zuul-tests.d/project.yaml +++ b/zuul-tests.d/project.yaml @@ -7,8 +7,6 @@ jobs: - zuul-tox-docs - tox-py27 - - tox-py35: - nodeset: ubuntu-xenial - tox-py38 - tox-py39: nodeset: ubuntu-focal @@ -16,8 +14,6 @@ jobs: - zuul-tox-docs - tox-py27 - - tox-py35: - nodeset: ubuntu-xenial - tox-py38 - tox-py39: nodeset: ubuntu-focal diff --git a/zuul-tests.d/python-jobs.yaml b/zuul-tests.d/python-jobs.yaml index ea27b731a..f8a8e0cd3 100644 --- a/zuul-tests.d/python-jobs.yaml +++ b/zuul-tests.d/python-jobs.yaml @@ -101,16 +101,6 @@ - name: ubuntu-bionic label: ubuntu-bionic -- job: - name: zuul-jobs-test-ensure-pip-ubuntu-xenial - description: Test the ensure-pip role on ubuntu-xenial - parent: zuul-jobs-test-ensure-pip - tags: auto-generated - nodeset: - nodes: - - name: ubuntu-xenial - label: ubuntu-xenial - - job: name: zuul-jobs-test-ensure-pip-ubuntu-focal description: Test the ensure-pip role on ubuntu-focal @@ -230,16 +220,6 @@ - name: ubuntu-bionic label: ubuntu-bionic -- job: - name: zuul-jobs-test-ensure-tox-ubuntu-xenial - description: Test the ensure-tox role on ubuntu-xenial - parent: zuul-jobs-test-ensure-tox - tags: auto-generated - nodeset: - nodes: - - name: ubuntu-xenial - label: ubuntu-xenial - - job: name: zuul-jobs-test-ensure-tox-ubuntu-focal description: Test the ensure-tox role on ubuntu-focal @@ -353,16 +333,6 @@ - name: ubuntu-bionic label: ubuntu-bionic -- job: - name: zuul-jobs-test-fetch-sphinx-tarball-ubuntu-xenial - description: Test the fetch-sphinx-tarball role on ubuntu-xenial - parent: zuul-jobs-test-fetch-sphinx-tarball - tags: auto-generated - nodeset: - nodes: - - name: ubuntu-xenial - label: ubuntu-xenial - - job: name: zuul-jobs-test-fetch-sphinx-tarball-ubuntu-focal description: Test the fetch-sphinx-tarball role on ubuntu-focal @@ -487,7 +457,6 @@ - zuul-jobs-test-ensure-pip-opensuse-15 - zuul-jobs-test-ensure-pip-opensuse-tumbleweed-nv - zuul-jobs-test-ensure-pip-ubuntu-bionic - - zuul-jobs-test-ensure-pip-ubuntu-xenial - zuul-jobs-test-ensure-pip-ubuntu-focal - zuul-jobs-test-ensure-sphinx - zuul-jobs-test-ensure-tox-centos-7 @@ -499,7 +468,6 @@ - zuul-jobs-test-ensure-tox-opensuse-15 - zuul-jobs-test-ensure-tox-opensuse-tumbleweed-nv - zuul-jobs-test-ensure-tox-ubuntu-bionic - - zuul-jobs-test-ensure-tox-ubuntu-xenial - zuul-jobs-test-ensure-tox-ubuntu-focal - zuul-jobs-test-fetch-sphinx-tarball-centos-7 - zuul-jobs-test-fetch-sphinx-tarball-centos-8 @@ -510,7 +478,6 @@ - zuul-jobs-test-fetch-sphinx-tarball-opensuse-15 - zuul-jobs-test-fetch-sphinx-tarball-opensuse-tumbleweed-nv - zuul-jobs-test-fetch-sphinx-tarball-ubuntu-bionic - - zuul-jobs-test-fetch-sphinx-tarball-ubuntu-xenial - zuul-jobs-test-fetch-sphinx-tarball-ubuntu-focal - zuul-jobs-test-tox - zuul-jobs-test-fetch-tox-output @@ -531,7 +498,6 @@ - zuul-jobs-test-ensure-pip-fedora-34 - zuul-jobs-test-ensure-pip-opensuse-15 - zuul-jobs-test-ensure-pip-ubuntu-bionic - - zuul-jobs-test-ensure-pip-ubuntu-xenial - zuul-jobs-test-ensure-pip-ubuntu-focal - zuul-jobs-test-ensure-sphinx - zuul-jobs-test-ensure-tox-centos-7 @@ -542,7 +508,6 @@ - zuul-jobs-test-ensure-tox-fedora-34 - zuul-jobs-test-ensure-tox-opensuse-15 - zuul-jobs-test-ensure-tox-ubuntu-bionic - - zuul-jobs-test-ensure-tox-ubuntu-xenial - zuul-jobs-test-ensure-tox-ubuntu-focal - zuul-jobs-test-fetch-sphinx-tarball-centos-7 - zuul-jobs-test-fetch-sphinx-tarball-centos-8 @@ -552,7 +517,6 @@ - zuul-jobs-test-fetch-sphinx-tarball-fedora-34 - zuul-jobs-test-fetch-sphinx-tarball-opensuse-15 - zuul-jobs-test-fetch-sphinx-tarball-ubuntu-bionic - - zuul-jobs-test-fetch-sphinx-tarball-ubuntu-xenial - zuul-jobs-test-fetch-sphinx-tarball-ubuntu-focal - zuul-jobs-test-tox - zuul-jobs-test-fetch-tox-output diff --git a/zuul-tests.d/python-roles-jobs.yaml b/zuul-tests.d/python-roles-jobs.yaml index 659b9c31e..6c7435614 100644 --- a/zuul-tests.d/python-roles-jobs.yaml +++ b/zuul-tests.d/python-roles-jobs.yaml @@ -103,16 +103,6 @@ - name: ubuntu-bionic label: ubuntu-bionic -- job: - name: zuul-jobs-test-build-python-release-jobs-ubuntu-xenial - description: Test the build-python-release-jobs role on ubuntu-xenial - parent: zuul-jobs-test-build-python-release-jobs - tags: auto-generated - nodeset: - nodes: - - name: ubuntu-xenial - label: ubuntu-xenial - - job: name: zuul-jobs-test-build-python-release-jobs-ubuntu-focal description: Test the build-python-release-jobs role on ubuntu-focal @@ -223,16 +213,6 @@ - name: ubuntu-bionic label: ubuntu-bionic -- job: - name: zuul-jobs-test-ensure-python-pyenv-ubuntu-xenial - description: Test the ensure-python role with pyenv on ubuntu-xenial - parent: zuul-jobs-test-ensure-python-pyenv - tags: auto-generated - nodeset: - nodes: - - name: ubuntu-xenial - label: ubuntu-xenial - - job: name: zuul-jobs-test-ensure-python-pyenv-ubuntu-focal description: Test the ensure-python role with pyenv on ubuntu-focal @@ -255,7 +235,6 @@ - zuul-jobs-test-build-python-release-jobs-opensuse-15 - zuul-jobs-test-build-python-release-jobs-opensuse-tumbleweed-nv - zuul-jobs-test-build-python-release-jobs-ubuntu-bionic - - zuul-jobs-test-build-python-release-jobs-ubuntu-xenial - zuul-jobs-test-build-python-release-jobs-ubuntu-focal - zuul-jobs-test-ensure-python-pyenv-centos-7 - zuul-jobs-test-ensure-python-pyenv-centos-8 @@ -266,7 +245,6 @@ - zuul-jobs-test-ensure-python-pyenv-opensuse-15 - zuul-jobs-test-ensure-python-pyenv-opensuse-tumbleweed-nv - zuul-jobs-test-ensure-python-pyenv-ubuntu-bionic - - zuul-jobs-test-ensure-python-pyenv-ubuntu-xenial - zuul-jobs-test-ensure-python-pyenv-ubuntu-focal gate: jobs: &id001 @@ -278,7 +256,6 @@ - zuul-jobs-test-build-python-release-jobs-fedora-34 - zuul-jobs-test-build-python-release-jobs-opensuse-15 - zuul-jobs-test-build-python-release-jobs-ubuntu-bionic - - zuul-jobs-test-build-python-release-jobs-ubuntu-xenial - zuul-jobs-test-build-python-release-jobs-ubuntu-focal - zuul-jobs-test-ensure-python-pyenv-centos-7 - zuul-jobs-test-ensure-python-pyenv-centos-8 @@ -288,7 +265,6 @@ - zuul-jobs-test-ensure-python-pyenv-fedora-34 - zuul-jobs-test-ensure-python-pyenv-opensuse-15 - zuul-jobs-test-ensure-python-pyenv-ubuntu-bionic - - zuul-jobs-test-ensure-python-pyenv-ubuntu-xenial - zuul-jobs-test-ensure-python-pyenv-ubuntu-focal periodic-weekly: jobs: *id001 diff --git a/zuul-tests.d/rust-jobs.yaml b/zuul-tests.d/rust-jobs.yaml index fb65cb1e4..e4183f767 100644 --- a/zuul-tests.d/rust-jobs.yaml +++ b/zuul-tests.d/rust-jobs.yaml @@ -104,16 +104,6 @@ - name: ubuntu-bionic label: ubuntu-bionic -- job: - name: zuul-jobs-test-rust-ubuntu-xenial - description: Test the rust roles on ubuntu-xenial - parent: zuul-jobs-test-rust - tags: auto-generated - nodeset: - nodes: - - name: ubuntu-xenial - label: ubuntu-xenial - - job: name: zuul-jobs-test-rust-ubuntu-focal description: Test the rust roles on ubuntu-focal @@ -136,7 +126,6 @@ - zuul-jobs-test-rust-opensuse-15 - zuul-jobs-test-rust-opensuse-tumbleweed-nv - zuul-jobs-test-rust-ubuntu-bionic - - zuul-jobs-test-rust-ubuntu-xenial - zuul-jobs-test-rust-ubuntu-focal gate: jobs: &id001 @@ -148,7 +137,6 @@ - zuul-jobs-test-rust-fedora-34 - zuul-jobs-test-rust-opensuse-15 - zuul-jobs-test-rust-ubuntu-bionic - - zuul-jobs-test-rust-ubuntu-xenial - zuul-jobs-test-rust-ubuntu-focal periodic-weekly: jobs: *id001 diff --git a/zuul-tests.d/terraform-jobs-roles.yaml b/zuul-tests.d/terraform-jobs-roles.yaml index ef8015a13..5d4e103ad 100644 --- a/zuul-tests.d/terraform-jobs-roles.yaml +++ b/zuul-tests.d/terraform-jobs-roles.yaml @@ -110,16 +110,6 @@ - name: ubuntu-bionic label: ubuntu-bionic -- job: - name: zuul-jobs-test-terraform-ubuntu-xenial - description: Test terraform job on ubuntu-xenial - parent: zuul-jobs-test-terraform - tags: auto-generated - nodeset: - nodes: - - name: ubuntu-xenial - label: ubuntu-xenial - - job: name: zuul-jobs-test-terraform-ubuntu-focal description: Test terraform job on ubuntu-focal @@ -243,16 +233,6 @@ - name: ubuntu-bionic label: ubuntu-bionic -- job: - name: zuul-jobs-test-terraform-role-ubuntu-xenial - description: Test terraform roles on ubuntu-xenial - parent: zuul-jobs-test-terraform-role - tags: auto-generated - nodeset: - nodes: - - name: ubuntu-xenial - label: ubuntu-xenial - - job: name: zuul-jobs-test-terraform-role-ubuntu-focal description: Test terraform roles on ubuntu-focal @@ -274,7 +254,6 @@ - zuul-jobs-test-terraform-fedora-34 - zuul-jobs-test-terraform-opensuse-15 - zuul-jobs-test-terraform-ubuntu-bionic - - zuul-jobs-test-terraform-ubuntu-xenial - zuul-jobs-test-terraform-ubuntu-focal - zuul-jobs-test-terraform-role-centos-7 - zuul-jobs-test-terraform-role-centos-8 @@ -284,7 +263,6 @@ - zuul-jobs-test-terraform-role-fedora-34 - zuul-jobs-test-terraform-role-opensuse-15 - zuul-jobs-test-terraform-role-ubuntu-bionic - - zuul-jobs-test-terraform-role-ubuntu-xenial - zuul-jobs-test-terraform-role-ubuntu-focal gate: *id001 periodic-weekly: