From 46803c9a9a933ed4b8aa7203073283e47c08b1f7 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Mon, 22 Sep 2014 13:40:03 -0700
Subject: [PATCH] Add new experimental jobs to test dib based nodes

We now have new dib based slave nodes, the next step in moving to dib is
to test that these images are viable for testing. Run experimental jobs
that are otherwise identical to two of our existing gate jobs (one with
neutron the other without) on these new dib based slaves.

Change-Id: If69f18a61529fe886a836c6c284103babbcfc2cb
---
 .../files/jenkins_job_builder/config/projects.yaml    | 11 +++++++++++
 modules/openstack_project/files/zuul/layout.yaml      |  2 ++
 .../files/zuul/openstack_functions.py                 |  3 +++
 3 files changed, 16 insertions(+)

diff --git a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
index 1aaa357eb4..1b37687f9f 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/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:
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index ae1c46eb96..482b3dfaf6 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -3082,6 +3082,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
diff --git a/modules/openstack_project/files/zuul/openstack_functions.py b/modules/openstack_project/files/zuul/openstack_functions.py
index 25cea6b482..1a8a546008 100644
--- a/modules/openstack_project/files/zuul/openstack_functions.py
+++ b/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'