diff --git a/zuul.d/integrated-gate.yaml b/zuul.d/integrated-gate.yaml index d35e25d32d..366f92d191 100644 --- a/zuul.d/integrated-gate.yaml +++ b/zuul.d/integrated-gate.yaml @@ -86,6 +86,17 @@ # Enbale horizon so that we can run horizon test. horizon: true +- job: + name: tempest-full-centos-9-stream + parent: tempest-full-py3 + nodeset: devstack-single-node-centos-9-stream + description: | + Base integration test on CentOS 9 stream + vars: + # Required until bug/1949606 is resolved when using libvirt and QEMU + # >=5.0.0 with a [libvirt]virt_type of qemu (TCG). + configure_swap_size: 4096 + - job: name: tempest-integrated-networking parent: devstack-tempest @@ -129,17 +140,15 @@ c-bak: false - job: - name: tempest-integrated-compute-centos-8-stream + name: tempest-integrated-compute-centos-9-stream parent: tempest-integrated-compute - # TODO(gmann): Make this job non voting until bug#1957941 if fixed. - voting: false - nodeset: devstack-single-node-centos-8-stream + nodeset: devstack-single-node-centos-9-stream branches: ^(?!stable/(ocata|pike|queens|rocky|stein|train|ussuri|victoria)).*$ description: | This job runs integration tests for compute. This is subset of 'tempest-full-py3' job and run Nova, Neutron, Cinder (except backup tests) and Glance related tests. This is meant to be run on Nova gate only. - This version of the job also uses CentOS 8 stream. + This version of the job also uses CentOS 9 stream. vars: # Required until bug/1949606 is resolved when using libvirt and QEMU # >=5.0.0 with a [libvirt]virt_type of qemu (TCG). @@ -357,12 +366,12 @@ - grenade-skip-level: voting: false - tempest-integrated-compute - - tempest-integrated-compute-centos-8-stream + - tempest-integrated-compute-centos-9-stream - openstacksdk-functional-devstack gate: jobs: - tempest-integrated-compute - - tempest-integrated-compute-centos-8-stream + - tempest-integrated-compute-centos-9-stream - openstacksdk-functional-devstack - project-template: diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index eb8b79321b..b79cdc9328 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -120,8 +120,6 @@ irrelevant-files: *tempest-irrelevant-files - openstack-tox-bashate: irrelevant-files: *tempest-irrelevant-files-2 - - tempest-full-py3-centos-8-stream: - irrelevant-files: *tempest-irrelevant-files - tempest-full-centos-9-stream: irrelevant-files: *tempest-irrelevant-files gate: @@ -137,8 +135,6 @@ irrelevant-files: *tempest-irrelevant-files - tempest-full-py3: irrelevant-files: *tempest-irrelevant-files - - tempest-full-py3-centos-8-stream: - irrelevant-files: *tempest-irrelevant-files - grenade: irrelevant-files: *tempest-irrelevant-files - tempest-ipv6-only: diff --git a/zuul.d/stable-jobs.yaml b/zuul.d/stable-jobs.yaml index 808645811d..edee044600 100644 --- a/zuul.d/stable-jobs.yaml +++ b/zuul.d/stable-jobs.yaml @@ -198,3 +198,41 @@ - stable/victoria - stable/wallaby - stable/xena + +- job: + name: tempest-integrated-compute-centos-8-stream + parent: tempest-integrated-compute + # TODO(gmann): Make this job non voting until bug#1957941 if fixed. + voting: false + nodeset: devstack-single-node-centos-8-stream + branches: + - stable/wallaby + - stable/xena + - stable/yoga + description: | + This job runs integration tests for compute. This is + subset of 'tempest-full-py3' job and run Nova, Neutron, Cinder (except backup tests) + and Glance related tests. This is meant to be run on Nova gate only. + This version of the job also uses CentOS 8 stream. + vars: + # Required until bug/1949606 is resolved when using libvirt and QEMU + # >=5.0.0 with a [libvirt]virt_type of qemu (TCG). + configure_swap_size: 4096 + +- job: + name: tempest-full-py3-centos-8-stream + parent: tempest-full-py3 + # TODO(gmann): Make this job non voting until bug#1957941 if fixed. + voting: false + branches: + - stable/wallaby + - stable/xena + - stable/yoga + nodeset: devstack-single-node-centos-8-stream + description: | + Base integration test with Neutron networking and py36 running + on CentOS 8 stream + vars: + # Required until bug/1949606 is resolved when using libvirt and QEMU + # >=5.0.0 with a [libvirt]virt_type of qemu (TCG). + configure_swap_size: 4096 diff --git a/zuul.d/tempest-specific.yaml b/zuul.d/tempest-specific.yaml index a4a4b676d3..822feaaa32 100644 --- a/zuul.d/tempest-specific.yaml +++ b/zuul.d/tempest-specific.yaml @@ -68,26 +68,6 @@ # without Swift, c-bak cannot run (in the Gate at least) c-bak: false -- job: - name: tempest-full-py3-centos-8-stream - parent: tempest-full-py3 - # TODO(gmann): Make this job non voting until bug#1957941 if fixed. - voting: false - nodeset: devstack-single-node-centos-8-stream - description: | - Base integration test with Neutron networking and py36 running - on CentOS 8 stream - vars: - # Required until bug/1949606 is resolved when using libvirt and QEMU - # >=5.0.0 with a [libvirt]virt_type of qemu (TCG). - configure_swap_size: 4096 - -- job: - name: tempest-full-centos-9-stream - parent: tempest-full-py3-centos-8-stream - voting: true - nodeset: devstack-single-node-centos-9-stream - - job: name: tempest-tox-plugin-sanity-check parent: tox