diff --git a/.zuul.yaml b/.zuul.yaml index cd662e5..fad9eea 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,7 +1,9 @@ - project: check: jobs: - - mixmatch-dsvm-functional: + - mixmatch-dsvm-functional-compute: + voting: false + - mixmatch-dsvm-functional-image-volume-network-scenario: voting: false - openstack-tox-lower-constraints @@ -9,7 +11,7 @@ jobs: - openstack-tox-lower-constraints - job: - name: mixmatch-dsvm-functional + name: mixmatch-dsvm-functional-base parent: legacy-dsvm-base run: playbooks/legacy/mixmatch-dsvm-functional/run.yaml post-run: playbooks/legacy/mixmatch-dsvm-functional/post.yaml @@ -18,3 +20,14 @@ - openstack-infra/devstack-gate - openstack/mixmatch +- job: + name: mixmatch-dsvm-functional-compute + parent: mixmatch-dsvm-functional-base + vars: + tempest_regex: "^tempest.api.compute" + +- job: + name: mixmatch-dsvm-functional-image-volume-network-scenario + parent: mixmatch-dsvm-functional-base + vars: + tempest_regex: "(^tempest.api.image|^tempest.api.volume|^tempest.api.network|^tempest.scenario)" diff --git a/mixmatch/tests/functional/hooks/dsvm_hook.sh b/mixmatch/tests/functional/hooks/dsvm_hook.sh index 3414503..59e4da1 100755 --- a/mixmatch/tests/functional/hooks/dsvm_hook.sh +++ b/mixmatch/tests/functional/hooks/dsvm_hook.sh @@ -38,5 +38,5 @@ fi sudo chown -R $USER:stack $BASE/new/tempest sudo chown -R $USER:stack /opt/stack/data/tempest -ostestr -r '(^tempest.api.compute|^tempest.api.image|^tempest.api.volume|^tempest.api.network|^tempest.scenario)' \ - --blacklist-file $BASE/new/mixmatch/mixmatch/tests/functional/tempest_blacklist.txt +ostestr -r "$TEMPEST_REGEX" --blacklist-file \ + $BASE/new/mixmatch/mixmatch/tests/functional/tempest_blacklist.txt diff --git a/playbooks/legacy/mixmatch-dsvm-functional/run.yaml b/playbooks/legacy/mixmatch-dsvm-functional/run.yaml index 0a4c07d..e9c82f5 100644 --- a/playbooks/legacy/mixmatch-dsvm-functional/run.yaml +++ b/playbooks/legacy/mixmatch-dsvm-functional/run.yaml @@ -41,6 +41,7 @@ function post_test_hook { # Configure and run functional tests + export TEMPEST_REGEX='{{ tempest_regex }}' $BASE/new/mixmatch/mixmatch/tests/functional/hooks/dsvm_hook.sh } export -f post_test_hook