Merge "Update ironic-multinode job"

jenkins/jobs/ironic.yaml

@@ -643,7 +643,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-ironic-ipa-{image-type}-{driver}-{ramdisk-type}{src}-multinode{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-ironic-ipa-{image-type}-{driver}-{ramdisk-type}{src}-multinode-{node-release}{job-suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/projects.yaml

@@ -5720,11 +5720,12 @@
           job-suffix: ''
           ramdisk-type: 'tinyipa256'
           src: '-src'
-      - '{pipeline}-tempest-dsvm-ironic-ipa-{image-type}-{driver}-{ramdisk-type}{src}-multinode{job-suffix}':
+      - '{pipeline}-tempest-dsvm-ironic-ipa-{image-type}-{driver}-{ramdisk-type}{src}-multinode-{node-release}{job-suffix}':
           pipeline: gate
-          node: ubuntu-trusty-2-node
+          node: ubuntu-xenial-2-node
+          node-release: ubuntu-xenial
           branch-override: default
-          driver: 'agent_ssh'
+          driver: 'agent_ipmitool'
           job-suffix: '-nv'
           ramdisk-type: 'tinyipa'
           image-type: 'wholedisk'

zuul/layout.yaml

@@ -10442,7 +10442,7 @@ projects:
       - gate-tempest-dsvm-ironic-ipa-partition-agent_ipmitool-tinyipa-ubuntu-xenial
       - gate-tempest-dsvm-ironic-ipa-partition-pxe_ssh-tinyipa-ubuntu-trusty
       - gate-tempest-dsvm-ironic-ipa-partition-pxe_ipmitool-tinyipa-ubuntu-xenial
-      - gate-tempest-dsvm-ironic-ipa-wholedisk-agent_ssh-tinyipa-multinode-nv
+      - gate-tempest-dsvm-ironic-ipa-wholedisk-agent_ipmitool-tinyipa-multinode-ubuntu-xenial-nv
       - gate-ironic-inspector-dsvm-ipa-nv
       - gate-tempest-dsvm-ironic-inspector-nv
       - gate-grenade-dsvm-ironic