diff --git a/.zuul.yaml b/.zuul.yaml index 0c4c3f02c8f2..155695c7eef2 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -369,8 +369,6 @@ - devstack-plugin-ceph-tempest-py3: voting: false irrelevant-files: *dsvm-irrelevant-files - - neutron-grenade-multinode: - irrelevant-files: *dsvm-irrelevant-files - neutron-tempest-linuxbridge: irrelevant-files: # NOTE(mriedem): This job has its own irrelevant-files section diff --git a/playbooks/legacy/nova-grenade-multinode/run.yaml b/playbooks/legacy/nova-grenade-multinode/run.yaml index d77fc0b9f953..18f7c753ebcc 100644 --- a/playbooks/legacy/nova-grenade-multinode/run.yaml +++ b/playbooks/legacy/nova-grenade-multinode/run.yaml @@ -31,7 +31,13 @@ export PYTHONUNBUFFERED=true export DEVSTACK_GATE_CONFIGDRIVE=0 export DEVSTACK_GATE_NEUTRON=1 - export DEVSTACK_GATE_TEMPEST_NOTESTS=1 + # NOTE(mriedem): Run tempest smoke tests specific to compute on the + # new side of the grenade environment. The post-test hook script will + # run non-smoke migration tests in a local/block and shared/ceph + # setup. Note that grenade hard-codes "tox -esmoke" for tempest on + # the old side so the regex is not appied there. + export DEVSTACK_GATE_TEMPEST=1 + export DEVSTACK_GATE_TEMPEST_REGEX="tempest\.(api\.compute|scenario)\..*smoke.*" export DEVSTACK_GATE_GRENADE=pullup export DEVSTACK_GATE_USE_PYTHON3=True # By default grenade runs only smoke tests so we need to set