diff --git a/test-playbooks/multinode/multi-node-bridge.yaml b/test-playbooks/multinode/multi-node-bridge.yaml index 0182b0f98..c79e9d252 100644 --- a/test-playbooks/multinode/multi-node-bridge.yaml +++ b/test-playbooks/multinode/multi-node-bridge.yaml @@ -49,6 +49,7 @@ - ovs_running is not changed - ovs_bridge is not changed - ovs_port.rc == 0 - - "'Port \"br-infra_' in ovs_port.stdout" + # Ubuntu focal era changed the quotes + - "('Port \"br-infra_' in ovs_port.stdout) or ('Port br-infra_' in ovs_port.stdout)" - ovs_ping_switch.rc == 0 - ovs_ping_peer.rc == 0 diff --git a/tools/update-test-platforms.py b/tools/update-test-platforms.py index 70cbb95c0..d6ddd9f71 100755 --- a/tools/update-test-platforms.py +++ b/tools/update-test-platforms.py @@ -38,6 +38,7 @@ PLATFORMS = [ 'opensuse-tumbleweed', 'ubuntu-bionic', 'ubuntu-xenial', + 'ubuntu-focal', ] # insert a platform from above to make it non-voting diff --git a/zuul-tests.d/general-roles-jobs.yaml b/zuul-tests.d/general-roles-jobs.yaml index 02505ce4d..7e9e05aa5 100644 --- a/zuul-tests.d/general-roles-jobs.yaml +++ b/zuul-tests.d/general-roles-jobs.yaml @@ -215,6 +215,16 @@ - 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 + parent: zuul-jobs-test-base-roles + tags: auto-generated + nodeset: + nodes: + - name: ubuntu-focal + label: ubuntu-focal + - job: name: zuul-jobs-test-bindep description: Test the bindep role @@ -320,6 +330,16 @@ - name: ubuntu-xenial label: ubuntu-xenial +- job: + name: zuul-jobs-test-bindep-ubuntu-focal + description: Test the bindep role on ubuntu-focal + parent: zuul-jobs-test-bindep + tags: auto-generated + nodeset: + nodes: + - name: ubuntu-focal + label: ubuntu-focal + - job: name: zuul-jobs-test-clear-firewall description: Test the clear-firewall role @@ -550,6 +570,25 @@ nodes: - secondary +- job: + name: zuul-jobs-test-multinode-roles-ubuntu-focal + description: Tests multinode setup roles on ubuntu-focal + parent: zuul-jobs-test-multinode-roles + tags: auto-generated + nodeset: + nodes: + - name: primary + label: ubuntu-focal + - name: secondary + label: ubuntu-focal + groups: + - name: switch + nodes: + - primary + - name: peers + nodes: + - secondary + - job: name: zuul-jobs-test-generate-zuul-manifest description: Test the generate-zuul-manifest role @@ -611,6 +650,7 @@ - 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 - zuul-jobs-test-bindep-debian-stretch @@ -620,6 +660,7 @@ - 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-ensure-bazelisk - zuul-jobs-test-netconsole @@ -633,6 +674,7 @@ - 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 - zuul-jobs-test-upload-git-mirror @@ -650,6 +692,7 @@ - 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 - zuul-jobs-test-bindep-debian-stretch @@ -658,6 +701,7 @@ - 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-ensure-bazelisk - zuul-jobs-test-netconsole @@ -669,6 +713,7 @@ - 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 - zuul-jobs-test-upload-git-mirror diff --git a/zuul-tests.d/go-jobs.yaml b/zuul-tests.d/go-jobs.yaml index 93b4189bd..828d55a5f 100644 --- a/zuul-tests.d/go-jobs.yaml +++ b/zuul-tests.d/go-jobs.yaml @@ -107,6 +107,16 @@ - name: ubuntu-xenial label: ubuntu-xenial +- job: + name: zuul-jobs-test-golang-go-ubuntu-focal + description: Test the golang-go job on ubuntu-focal + parent: zuul-jobs-test-golang-go + tags: auto-generated + nodeset: + nodes: + - name: ubuntu-focal + label: ubuntu-focal + - project: check: jobs: @@ -119,6 +129,7 @@ - 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: - zuul-jobs-test-golang-go-centos-7 @@ -129,3 +140,4 @@ - 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 diff --git a/zuul-tests.d/packer-jobs.yaml b/zuul-tests.d/packer-jobs.yaml index da8ae871d..7cbff0748 100644 --- a/zuul-tests.d/packer-jobs.yaml +++ b/zuul-tests.d/packer-jobs.yaml @@ -109,6 +109,16 @@ - name: ubuntu-xenial label: ubuntu-xenial +- job: + name: zuul-jobs-test-packer-ubuntu-focal + description: Test packer job on ubuntu-focal + parent: zuul-jobs-test-packer + tags: auto-generated + nodeset: + nodes: + - name: ubuntu-focal + label: ubuntu-focal + - project: check: jobs: @@ -121,6 +131,7 @@ - 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: - zuul-jobs-test-packer-centos-7 @@ -131,3 +142,4 @@ - zuul-jobs-test-packer-opensuse-15 - zuul-jobs-test-packer-ubuntu-bionic - zuul-jobs-test-packer-ubuntu-xenial + - zuul-jobs-test-packer-ubuntu-focal diff --git a/zuul-tests.d/python-jobs.yaml b/zuul-tests.d/python-jobs.yaml index fdb2c2726..cb5173d2d 100644 --- a/zuul-tests.d/python-jobs.yaml +++ b/zuul-tests.d/python-jobs.yaml @@ -101,6 +101,16 @@ - name: ubuntu-xenial label: ubuntu-xenial +- job: + name: zuul-jobs-test-ensure-pip-ubuntu-focal + description: Test the ensure-pip role on ubuntu-focal + parent: zuul-jobs-test-ensure-pip + tags: auto-generated + nodeset: + nodes: + - name: ubuntu-focal + label: ubuntu-focal + - job: name: zuul-jobs-test-ensure-sphinx description: Test the ensure-sphinx role @@ -210,6 +220,16 @@ - name: ubuntu-xenial label: ubuntu-xenial +- job: + name: zuul-jobs-test-ensure-tox-ubuntu-focal + description: Test the ensure-tox role on ubuntu-focal + parent: zuul-jobs-test-ensure-tox + tags: auto-generated + nodeset: + nodes: + - name: ubuntu-focal + label: ubuntu-focal + - job: name: zuul-jobs-test-fetch-sphinx-tarball description: Test the fetch-sphinx-tarball role @@ -312,6 +332,16 @@ - 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 + parent: zuul-jobs-test-fetch-sphinx-tarball + tags: auto-generated + nodeset: + nodes: + - name: ubuntu-focal + label: ubuntu-focal + - job: name: zuul-jobs-test-tox description: Test the tox role's sibling functionality @@ -426,6 +456,7 @@ - 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 - zuul-jobs-test-ensure-tox-centos-8 @@ -436,6 +467,7 @@ - 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 - zuul-jobs-test-fetch-sphinx-tarball-debian-stretch @@ -445,6 +477,7 @@ - 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 - zuul-jobs-test-fetch-tox-output-synchronize @@ -464,6 +497,7 @@ - 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 - zuul-jobs-test-ensure-tox-centos-8 @@ -473,6 +507,7 @@ - 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 - zuul-jobs-test-fetch-sphinx-tarball-debian-stretch @@ -481,6 +516,7 @@ - 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 - zuul-jobs-test-fetch-tox-output-synchronize diff --git a/zuul-tests.d/python-roles-jobs.yaml b/zuul-tests.d/python-roles-jobs.yaml index 53f478902..0470a516d 100644 --- a/zuul-tests.d/python-roles-jobs.yaml +++ b/zuul-tests.d/python-roles-jobs.yaml @@ -103,6 +103,16 @@ - 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 + parent: zuul-jobs-test-build-python-release-jobs + tags: auto-generated + nodeset: + nodes: + - name: ubuntu-focal + label: ubuntu-focal + - job: name: zuul-jobs-test-ensure-python-pyenv description: Test the ensure-python role with pyenv @@ -203,6 +213,16 @@ - 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 + parent: zuul-jobs-test-ensure-python-pyenv + tags: auto-generated + nodeset: + nodes: + - name: ubuntu-focal + label: ubuntu-focal + - project: check: jobs: @@ -215,6 +235,7 @@ - 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 - zuul-jobs-test-ensure-python-pyenv-debian-stretch @@ -224,6 +245,7 @@ - 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: - zuul-jobs-test-build-python-release-jobs-centos-7 @@ -234,6 +256,7 @@ - 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 - zuul-jobs-test-ensure-python-pyenv-debian-stretch @@ -242,3 +265,4 @@ - 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 diff --git a/zuul-tests.d/terraform-jobs-roles.yaml b/zuul-tests.d/terraform-jobs-roles.yaml index 1adbdddde..404612645 100644 --- a/zuul-tests.d/terraform-jobs-roles.yaml +++ b/zuul-tests.d/terraform-jobs-roles.yaml @@ -111,6 +111,16 @@ - name: ubuntu-xenial label: ubuntu-xenial +- job: + name: zuul-jobs-test-terraform-ubuntu-focal + description: Test terraform job on ubuntu-focal + parent: zuul-jobs-test-terraform + tags: auto-generated + nodeset: + nodes: + - name: ubuntu-focal + label: ubuntu-focal + - job: name: zuul-jobs-test-terraform-role parent: terraform-base @@ -224,6 +234,16 @@ - name: ubuntu-xenial label: ubuntu-xenial +- job: + name: zuul-jobs-test-terraform-role-ubuntu-focal + description: Test terraform roles on ubuntu-focal + parent: zuul-jobs-test-terraform-role + tags: auto-generated + nodeset: + nodes: + - name: ubuntu-focal + label: ubuntu-focal + - project: check: &id001 jobs: @@ -235,6 +255,7 @@ - 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 - zuul-jobs-test-terraform-role-debian-stretch @@ -243,4 +264,5 @@ - 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