diff options
Diffstat (limited to 'zuul.d')
-rw-r--r-- | zuul.d/base.yaml | 3 | ||||
-rw-r--r-- | zuul.d/integrated-gate.yaml | 12 | ||||
-rw-r--r-- | zuul.d/project.yaml | 18 | ||||
-rw-r--r-- | zuul.d/stable-jobs.yaml | 18 | ||||
-rw-r--r-- | zuul.d/tempest-specific.yaml | 2 |
5 files changed, 44 insertions, 9 deletions
diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml index 3deb944d4..2d978c04e 100644 --- a/zuul.d/base.yaml +++ b/zuul.d/base.yaml @@ -72,7 +72,8 @@ and a tempest one exist. timeout: 10800 vars: - tox_envlist: full + # This job run multinode and smoke tests. + tox_envlist: multinode devstack_localrc: FORCE_CONFIG_DRIVE: false NOVA_ALLOW_MOVE_TO_SAME_HOST: false diff --git a/zuul.d/integrated-gate.yaml b/zuul.d/integrated-gate.yaml index 2c720d9c8..32c017a21 100644 --- a/zuul.d/integrated-gate.yaml +++ b/zuul.d/integrated-gate.yaml @@ -60,6 +60,15 @@ c-bak: false - job: + name: tempest-extra-tests + parent: devstack-tempest + description: | + This job runs the extra tests mentioned in + tools/tempest-extra-tests-list.txt. + vars: + tox_envlist: extra-tests + +- job: name: tempest-full-py3 parent: devstack-tempest # This job version is with swift enabled on py3 @@ -74,7 +83,7 @@ required-projects: - openstack/horizon vars: - tox_envlist: full + tox_envlist: integrated-full devstack_localrc: USE_PYTHON3: true FORCE_CONFIG_DRIVE: true @@ -107,6 +116,7 @@ # 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 + tox_envlist: full - job: name: tempest-integrated-networking diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index e41a9f7f4..d20186ece 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -26,6 +26,8 @@ - ^.gitignore$ - ^.gitreview$ - ^.mailmap$ + - tempest-extra-tests: + irrelevant-files: *tempest-irrelevant-files - tempest-full-ubuntu-focal: irrelevant-files: *tempest-irrelevant-files - glance-multistore-cinder-import: @@ -35,11 +37,7 @@ irrelevant-files: *tempest-irrelevant-files - tempest-full-xena: irrelevant-files: *tempest-irrelevant-files - # Temporarily marked as n-v due to the below bug which blocks - # the CI and complicates merging of patches. - # https://bugs.launchpad.net/tempest/+bug/1998916 - tempest-multinode-full-py3: - voting: false irrelevant-files: *tempest-irrelevant-files - tempest-tox-plugin-sanity-check: irrelevant-files: &tempest-irrelevant-files-2 @@ -63,6 +61,7 @@ - ^tools/tempest-integrated-gate-placement-exclude-list.txt - ^tools/tempest-integrated-gate-storage-blacklist.txt - ^tools/tempest-integrated-gate-storage-exclude-list.txt + - ^tools/tempest-extra-tests-list.txt - ^tools/verify-ipv6-only-deployments.sh - ^tools/with_venv.sh # tools/ is not here since this relies on a script in tools/. @@ -86,6 +85,7 @@ - ^tools/tempest-integrated-gate-placement-exclude-list.txt - ^tools/tempest-integrated-gate-storage-blacklist.txt - ^tools/tempest-integrated-gate-storage-exclude-list.txt + - ^tools/tempest-extra-tests-list.txt - ^tools/tempest-plugin-sanity.sh - ^tools/with_venv.sh - ^.coveragerc$ @@ -131,13 +131,14 @@ irrelevant-files: *tempest-irrelevant-files - tempest-full-py3: irrelevant-files: *tempest-irrelevant-files + - tempest-extra-tests: + irrelevant-files: *tempest-irrelevant-files - grenade: irrelevant-files: *tempest-irrelevant-files - tempest-ipv6-only: irrelevant-files: *tempest-irrelevant-files-3 - # https://bugs.launchpad.net/tempest/+bug/1998916 - #- tempest-multinode-full-py3: - # irrelevant-files: *tempest-irrelevant-files + - tempest-multinode-full-py3: + irrelevant-files: *tempest-irrelevant-files - tempest-full-enforce-scope-new-defaults: irrelevant-files: *tempest-irrelevant-files #- devstack-plugin-ceph-tempest-py3: @@ -179,6 +180,9 @@ - tempest-slow-zed - tempest-slow-yoga - tempest-slow-xena + - tempest-full-zed-extra-tests + - tempest-full-yoga-extra-tests + - tempest-full-xena-extra-tests periodic: jobs: - tempest-all diff --git a/zuul.d/stable-jobs.yaml b/zuul.d/stable-jobs.yaml index fb2300b25..f70e79cce 100644 --- a/zuul.d/stable-jobs.yaml +++ b/zuul.d/stable-jobs.yaml @@ -18,6 +18,24 @@ override-checkout: stable/xena - job: + name: tempest-full-zed-extra-tests + parent: tempest-extra-tests + nodeset: openstack-single-node-focal + override-checkout: stable/zed + +- job: + name: tempest-full-yoga-extra-tests + parent: tempest-extra-tests + nodeset: openstack-single-node-focal + override-checkout: stable/yoga + +- job: + name: tempest-full-xena-extra-tests + parent: tempest-extra-tests + nodeset: openstack-single-node-focal + override-checkout: stable/xena + +- job: name: tempest-slow-zed parent: tempest-slow-py3 nodeset: openstack-two-node-focal diff --git a/zuul.d/tempest-specific.yaml b/zuul.d/tempest-specific.yaml index 684270a5d..972123ee9 100644 --- a/zuul.d/tempest-specific.yaml +++ b/zuul.d/tempest-specific.yaml @@ -30,6 +30,8 @@ - opendev.org/openstack/oslo.utils - opendev.org/openstack/oslo.versionedobjects - opendev.org/openstack/oslo.vmware + vars: + tox_envlist: full - job: name: tempest-full-parallel |