summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-07-05 21:57:19 +0000
committerGerrit Code Review <review@openstack.org>2018-07-05 21:57:19 +0000
commit0d4ddbf6daa61cf0d96575a8269c14236f0c7eb6 (patch)
tree059455d05de6eba6746d6a2ed9e332bd1524f0f4
parentef2efe02f98bf398002d80cb46a330206ee3fce8 (diff)
parentae11bb3a96cf746d7f2f2181fed8ae51bfe16746 (diff)
Merge "Split functional job"
-rw-r--r--.zuul.yaml17
-rwxr-xr-xmixmatch/tests/functional/hooks/dsvm_hook.sh4
-rw-r--r--playbooks/legacy/mixmatch-dsvm-functional/run.yaml1
3 files changed, 18 insertions, 4 deletions
diff --git a/.zuul.yaml b/.zuul.yaml
index cd662e5..fad9eea 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,7 +1,9 @@
1- project: 1- project:
2 check: 2 check:
3 jobs: 3 jobs:
4 - mixmatch-dsvm-functional: 4 - mixmatch-dsvm-functional-compute:
5 voting: false
6 - mixmatch-dsvm-functional-image-volume-network-scenario:
5 voting: false 7 voting: false
6 8
7 - openstack-tox-lower-constraints 9 - openstack-tox-lower-constraints
@@ -9,7 +11,7 @@
9 jobs: 11 jobs:
10 - openstack-tox-lower-constraints 12 - openstack-tox-lower-constraints
11- job: 13- job:
12 name: mixmatch-dsvm-functional 14 name: mixmatch-dsvm-functional-base
13 parent: legacy-dsvm-base 15 parent: legacy-dsvm-base
14 run: playbooks/legacy/mixmatch-dsvm-functional/run.yaml 16 run: playbooks/legacy/mixmatch-dsvm-functional/run.yaml
15 post-run: playbooks/legacy/mixmatch-dsvm-functional/post.yaml 17 post-run: playbooks/legacy/mixmatch-dsvm-functional/post.yaml
@@ -18,3 +20,14 @@
18 - openstack-infra/devstack-gate 20 - openstack-infra/devstack-gate
19 - openstack/mixmatch 21 - openstack/mixmatch
20 22
23- job:
24 name: mixmatch-dsvm-functional-compute
25 parent: mixmatch-dsvm-functional-base
26 vars:
27 tempest_regex: "^tempest.api.compute"
28
29- job:
30 name: mixmatch-dsvm-functional-image-volume-network-scenario
31 parent: mixmatch-dsvm-functional-base
32 vars:
33 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
38sudo chown -R $USER:stack $BASE/new/tempest 38sudo chown -R $USER:stack $BASE/new/tempest
39sudo chown -R $USER:stack /opt/stack/data/tempest 39sudo chown -R $USER:stack /opt/stack/data/tempest
40 40
41ostestr -r '(^tempest.api.compute|^tempest.api.image|^tempest.api.volume|^tempest.api.network|^tempest.scenario)' \ 41ostestr -r "$TEMPEST_REGEX" --blacklist-file \
42 --blacklist-file $BASE/new/mixmatch/mixmatch/tests/functional/tempest_blacklist.txt 42 $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 @@
41 41
42 function post_test_hook { 42 function post_test_hook {
43 # Configure and run functional tests 43 # Configure and run functional tests
44 export TEMPEST_REGEX='{{ tempest_regex }}'
44 $BASE/new/mixmatch/mixmatch/tests/functional/hooks/dsvm_hook.sh 45 $BASE/new/mixmatch/mixmatch/tests/functional/hooks/dsvm_hook.sh
45 } 46 }
46 export -f post_test_hook 47 export -f post_test_hook