Browse Source

Merge "Change TripleO job to run against scenario 3"

tags/6.0.0.0b1
Zuul 3 months ago
parent
commit
f0843c1988
2 changed files with 28 additions and 4 deletions
  1. 18
    0
      zuul.d/networkin-ovn-jobs.yaml
  2. 10
    4
      zuul.d/project.yaml

+ 18
- 0
zuul.d/networkin-ovn-jobs.yaml View File

@@ -151,6 +151,7 @@
151 151
         OVN_L3_CREATE_PUBLIC_NETWORK: true
152 152
       rally_task: rally-jobs/ovn.yaml
153 153
     timeout: 7800
154
+
154 155
 - job:
155 156
     name: networking-ovn-tripleo-c7-s007-oooq-containers
156 157
     parent: tripleo-ci-centos-7-scenario007-multinode-oooq-container
@@ -164,3 +165,20 @@
164 165
       - ^tox.ini$
165 166
       - ^vagrant/.*$
166 167
       - ^migration/.*$
168
+
169
+- job:
170
+    name: networking-ovn-tripleo-c7-s003-oooq-containers
171
+    parent: tripleo-ci-base-multinode
172
+    vars:
173
+      nodes: 1ctlr
174
+      featureset: '018'
175
+    irrelevant-files:
176
+      - ^(test-|)requirements.txt$
177
+      - ^.*\.rst$
178
+      - ^doc/.*$
179
+      - ^releasenotes/.*$
180
+      - ^setup.cfg$
181
+      - ^tools/.*$
182
+      - ^tox.ini$
183
+      - ^vagrant/.*$
184
+      - ^migration/.*$

+ 10
- 4
zuul.d/project.yaml View File

@@ -21,10 +21,13 @@
21 21
         # Note we don't use a project-template here, so it's easier
22 22
         # to disable voting on one specific job if things go wrong.
23 23
         # tripleo-ci-centos-7-scenario007-multinode-oooq-container will
24
-        # run in Pike and beyond.
24
+        # run until Rocky while in Stein and beyond, scenario003 will run.
25 25
         # If you need any support to debug these jobs in case of
26 26
         # failures, please reach us on #tripleo IRC channel.
27
-        - networking-ovn-tripleo-c7-s007-oooq-containers
27
+        - networking-ovn-tripleo-c7-s007-oooq-containers:
28
+            branches: ^(stable/(pike|queens|rocky)).*$
29
+        - networking-ovn-tripleo-c7-s003-oooq-containers:
30
+            branches: ^(?!stable/(pike|queens|rocky)).*$
28 31
         - networking-ovn-dsvm-grenade:
29 32
             branches: ^(?!stable/(ocata|pike|queens)).*$
30 33
             voting: false
@@ -40,8 +43,11 @@
40 43
         - networking-ovn-dsvm-functional
41 44
         - networking-ovn-dsvm-functional-py35:
42 45
             branches: ^(?!stable/newton).*$
43
-        - tripleo-ci-centos-7-scenario007-multinode-oooq
44
-        - tripleo-ci-centos-7-scenario007-multinode-oooq-container
46
+        - tripleo-ci-centos-7-scenario007-multinode-oooq-container:
47
+            branches: ^(stable/(pike|queens|rocky)).*$
48
+        - tripleo-ci-centos-7-scenario003-multinode-oooq-container:
49
+            branches: ^(?!stable/(pike|queens|rocky)).*$
50
+
45 51
     experimental:
46 52
       jobs:
47 53
         - networking-ovn-tempest-dsvm-multinode:

Loading…
Cancel
Save