Merge "Add new experimental jobs to test dib based nodes"

modules/openstack_project/files/jenkins_job_builder/config/projects.yaml

@@ -1740,6 +1740,17 @@
           branch-designator: ''
           branch-override: default
           topology: aiopcpu
+      # Experimental jobs for testing dib images.
+      - '{pipeline}-tempest-dsvm-full{branch-designator}':
+          pipeline: experimental
+          node: devstack-trusty-dib
+          branch-designator: '-dibtest'
+          branch-override: default
+      - '{pipeline}-tempest-dsvm-neutron-full{branch-designator}':
+          pipeline: experimental
+          node: devstack-trusty-dib
+          branch-designator: '-dibtest'
+          branch-override: default
 
 
 - project:

modules/openstack_project/files/zuul/layout.yaml

@@ -3079,6 +3079,8 @@ projects:
       - check-tempest-dsvm-centos7
       - check-grenade-dsvm-ironic-sideways
       - check-grenade-dsvm-neutron-sideways
+      - experimental-tempest-dsvm-full-dibtest
+      - experimental-tempest-dsvm-neutron-full-dibtest
     experimental-tripleo:
       - check-tripleo-novabm-undercloud-precise-nonha
       - check-tripleo-ironic-undercloud-precise-nonha

modules/openstack_project/files/zuul/openstack_functions.py

@@ -55,6 +55,9 @@ def devstack_params(item, job, params):
         params['ZUUL_NODE'] = 'devstack-trusty-2-node'
     elif 'newlibvirt' in job.name:
         params['ZUUL_NODE'] = 'devstack-f20-virt-preview'
+    # Remove this when we are done doing prelimindary dib testing.
+    elif 'dibtest' in job.name:
+        params['ZUUL_NODE'] = 'devstack-trusty-dib'
     else:
         params['ZUUL_NODE'] = 'devstack-trusty'