Merge "Add scenario008 job to include containers"

zuul.d/multinode-jobs.yaml

@@ -39,6 +39,7 @@
         - tripleo-ci-centos-7-scenario003-multinode-oooq-container
         - tripleo-ci-centos-7-scenario004-multinode-oooq-container
         - tripleo-ci-centos-7-scenario007-multinode-oooq-container
+        - tripleo-ci-centos-7-scenario008-multinode-oooq-container
     gate:
       queue: tripleo
       jobs:
@@ -76,7 +77,6 @@
       jobs:
         - tripleo-ci-centos-7-scenario005-multinode-oooq
         - tripleo-ci-centos-7-scenario006-multinode-oooq
-        - tripleo-ci-centos-7-scenario008-multinode-oooq
         - tripleo-ci-centos-7-scenario009-multinode-oooq
         - tripleo-ci-centos-7-scenario010-multinode-oooq-container
         - tripleo-ci-centos-7-scenario011-multinode-oooq-container
@@ -281,6 +281,18 @@
     vars:
       toci_jobtype: multinode-1ctlr-featureset030
 
+- job:
+    name: tripleo-ci-centos-7-scenario008-multinode-oooq-container
+    parent: tripleo-ci-dsvm-multinode
+    run: playbooks/tripleo-ci/run.yaml
+    post-run: playbooks/tripleo-ci/post.yaml
+    timeout: 10800
+    nodeset: legacy-centos-7-2-node
+    voting: false
+    branches: ^(?!stable/(newton|ocata|pike|queens)).*$
+    vars:
+      toci_jobtype: multinode-1ctlr-featureset031
+
 - job:
     name: tripleo-ci-centos-7-scenario008-multinode-oooq
     parent: tripleo-ci-dsvm-multinode
@@ -289,7 +301,7 @@
     timeout: 10800
     nodeset: legacy-centos-7-2-node
     voting: false
-    branches: ^(?!stable/(newton|ocata)).*$
+    branches: ^(?!stable/(newton|ocata|pike|queens)).*$
     vars:
       toci_jobtype: multinode-1ctlr-featureset031