Merge "Create containers and standalone-ipa multinode -options jobs"

zuul.d/multinode-jobs.yaml

@@ -258,12 +258,20 @@
     branches: &c9_branches ^(?!stable/(train|victoria)).*$
     irrelevant-files: *multinode_ignored
     voting: true
+
+- job:
+    name: tripleo-ci-containers-multinode-options
     vars:
       nodes: 1ctlr
       featureset: '010'
       playbooks:
         - multinode.yml
 
+- job:
+    name: tripleo-ci-centos-9-containers-multinode
+    branches: *c9_branches
+    parent: tripleo-ci-containers-multinode-options
+
 - job:
     name: tripleo-ci-centos-9-scenario007-multinode-oooq-container
     parent: tripleo-ci-base-multinode-centos-9
@@ -281,11 +289,11 @@
     parent: tripleo-ci-base-multinode-centos-8
     branches: &c8_branches ^(stable/(train|victoria)).*$
     voting: true
-    vars:
-      nodes: 1ctlr
-      featureset: '010'
-      playbooks:
-        - multinode.yml
+
+- job:
+    name: tripleo-ci-centos-8-containers-multinode
+    branches: *c8_branches
+    parent: tripleo-ci-containers-multinode-options
 
 - job:
     name: tripleo-ci-centos-8-containers-undercloud-minion

zuul.d/standalone-jobs.yaml

@@ -844,15 +844,7 @@
 
 
 - job:
-    name: tripleo-ci-centos-8-standalone-on-multinode-ipa
-    parent: tripleo-ci-base-standalone-centos-8
-    voting: true
-    nodeset: two-centos-8-nodes
-    branches: ^(stable/victoria).*$
-    required-projects:
-      - opendev.org/x/tripleo-ipa
-    roles:
-      - zuul: opendev.org/x/tripleo-ipa
+    name: tripleo-ci-standalone-on-multinode-ipa-options
     vars: &multinode_ipa_job_vars
       featureset: '052'
       enable_tls: true
@@ -870,6 +862,22 @@
         tempest_tempest_conf_overrides:
           service-clients.http_timeout: '120'
 
+- job:
+    name: tripleo-ci-centos-8-standalone-on-multinode-ipa
+    parent: tripleo-ci-base-standalone-centos-8
+    voting: true
+    nodeset: two-centos-8-nodes
+    branches: ^(stable/victoria).*$
+    required-projects:
+      - opendev.org/x/tripleo-ipa
+    roles:
+      - zuul: opendev.org/x/tripleo-ipa
+
+- job:
+    name: tripleo-ci-centos-8-standalone-on-multinode-ipa
+    branches: *c8_branches
+    parent: tripleo-ci-standalone-on-multinode-ipa-options
+
 - job:
     name: tripleo-ci-centos-9-standalone-on-multinode-ipa
     parent: tripleo-ci-base-standalone-centos-9
@@ -879,7 +887,12 @@
       - opendev.org/x/tripleo-ipa
     roles:
       - zuul: opendev.org/x/tripleo-ipa
-    vars: *multinode_ipa_job_vars
+
+- job:
+    name: tripleo-ci-centos-9-standalone-on-multinode-ipa
+    branches: *c9_branches
+    parent: tripleo-ci-standalone-on-multinode-ipa-options
+
 
 - job:
     name: tripleo-ci-centos-8-repoclosure