Merge "Split functional job"

This commit is contained in:
Zuul 2018-07-05 21:57:19 +00:00 committed by Gerrit Code Review
commit 0d4ddbf6da
3 changed files with 18 additions and 4 deletions

View File

@ -1,7 +1,9 @@
- project: - project:
check: check:
jobs: jobs:
- mixmatch-dsvm-functional: - mixmatch-dsvm-functional-compute:
voting: false
- mixmatch-dsvm-functional-image-volume-network-scenario:
voting: false voting: false
- openstack-tox-lower-constraints - openstack-tox-lower-constraints
@ -9,7 +11,7 @@
jobs: jobs:
- openstack-tox-lower-constraints - openstack-tox-lower-constraints
- job: - job:
name: mixmatch-dsvm-functional name: mixmatch-dsvm-functional-base
parent: legacy-dsvm-base parent: legacy-dsvm-base
run: playbooks/legacy/mixmatch-dsvm-functional/run.yaml run: playbooks/legacy/mixmatch-dsvm-functional/run.yaml
post-run: playbooks/legacy/mixmatch-dsvm-functional/post.yaml post-run: playbooks/legacy/mixmatch-dsvm-functional/post.yaml
@ -18,3 +20,14 @@
- openstack-infra/devstack-gate - openstack-infra/devstack-gate
- openstack/mixmatch - 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)"

View File

@ -38,5 +38,5 @@ fi
sudo chown -R $USER:stack $BASE/new/tempest sudo chown -R $USER:stack $BASE/new/tempest
sudo chown -R $USER:stack /opt/stack/data/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)' \ ostestr -r "$TEMPEST_REGEX" --blacklist-file \
--blacklist-file $BASE/new/mixmatch/mixmatch/tests/functional/tempest_blacklist.txt $BASE/new/mixmatch/mixmatch/tests/functional/tempest_blacklist.txt

View File

@ -41,6 +41,7 @@
function post_test_hook { function post_test_hook {
# Configure and run functional tests # Configure and run functional tests
export TEMPEST_REGEX='{{ tempest_regex }}'
$BASE/new/mixmatch/mixmatch/tests/functional/hooks/dsvm_hook.sh $BASE/new/mixmatch/mixmatch/tests/functional/hooks/dsvm_hook.sh
} }
export -f post_test_hook export -f post_test_hook