Merge "Add Ironic multinode job"

jenkins/jobs/ironic.yaml

@@ -112,6 +112,13 @@
             export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_NETWORK_INTERFACE=neutron"
             export DEVSTACK_GATE_TEMPEST_REGEX=baremetal_multitenancy
 
+- builder:
+    name: ironic-multinode
+    builders:
+      - ironic-extra-vars:
+          script: |
+            export DEVSTACK_GATE_TOPOLOGY="multinode"
+
 - builder:
     name: ironic-inspector-enabled
     builders:
@@ -549,6 +556,37 @@
       - devstack-logs
       - console-log
 
+- job-template:
+    name: '{pipeline}-tempest-dsvm-ironic-ipa-{image-type}-{driver}-{ramdisk-type}{src}-multinode{job-suffix}'
+    node: '{node}'
+
+    wrappers:
+      - build-timeout:
+          timeout: 75
+      - timestamps
+
+    builders:
+      - print-template-name:
+          template-name: "{template-name}"
+      - link-logs
+      - net-info
+      - devstack-checkout
+      - ironic-deploy-with-IPA:
+          ramdisk-type: '{ramdisk-type}'
+      - ironic-tempest-regex:
+          tempest-regex: ironic
+      - ironic-multinode
+      - devstack-virtual-ironic:
+          build-ramdisk: '{src}'
+          deploy_driver: '{driver}'
+          image-type: '{image-type}'
+          branch-override: '{branch-override}'
+          bm-vm-count: 1
+
+    publishers:
+      - devstack-logs
+      - console-log
+
 - job-template:
     name: '{pipeline}-tempest-dsvm-ironic-pxe_ipa-full{job-suffix}'
     node: '{node}'

jenkins/jobs/projects.yaml

@@ -3294,6 +3294,15 @@
           driver: 'pxe_ssh'
           job-suffix: ''
           ramdisk-type: 'tinyipa256'
+      - '{pipeline}-tempest-dsvm-ironic-ipa-{image-type}-{driver}-{ramdisk-type}{src}-multinode{job-suffix}':
+          pipeline: gate
+          node: ubuntu-trusty-2-node
+          branch-override: default
+          driver: 'pxe_ssh'
+          job-suffix: '-nv'
+          ramdisk-type: 'tinyipa'
+          image-type: 'partition'
+          src: ''
       - '{pipeline}-ironic-dsvm-functional{job-suffix}':
           pipeline: gate
           node: ubuntu-trusty

zuul/layout.yaml

@@ -7906,6 +7906,7 @@ projects:
       - gate-ironic-dsvm-functional
       - gate-tempest-dsvm-ironic-parallel-nv
       - gate-tempest-dsvm-ironic-pxe_ipa-full-nv
+      - gate-tempest-dsvm-ironic-ipa-partition-pxe_ssh-tinyipa-multinode-nv
 
   - name: openstack/ironic-inspector
     template: