Browse Source

Merge "Split functional job"

Zuul 9 months ago
parent
commit
0d4ddbf6da

+ 15
- 2
.zuul.yaml View File

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

+ 2
- 2
mixmatch/tests/functional/hooks/dsvm_hook.sh View File

@@ -38,5 +38,5 @@ fi
38 38
 sudo chown -R $USER:stack $BASE/new/tempest
39 39
 sudo chown -R $USER:stack /opt/stack/data/tempest
40 40
 
41
-ostestr -r '(^tempest.api.compute|^tempest.api.image|^tempest.api.volume|^tempest.api.network|^tempest.scenario)' \
42
-    --blacklist-file $BASE/new/mixmatch/mixmatch/tests/functional/tempest_blacklist.txt
41
+ostestr -r "$TEMPEST_REGEX" --blacklist-file \
42
+    $BASE/new/mixmatch/mixmatch/tests/functional/tempest_blacklist.txt

+ 1
- 0
playbooks/legacy/mixmatch-dsvm-functional/run.yaml View File

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

Loading…
Cancel
Save