Use devstack-oneiric for stable/diablo.

Add custom function to determine node label to use for devstack
gate jobs.

Add support for the 'label' parameter type to job builder.

Add label parameters to the devstack gate jobs.

Change-Id: Ic7d5a45e97c94dd72606431d57a67b21f374adb7

manifests/site.pp

@@ -339,6 +339,10 @@ node "jenkins.openstack.org" {
     ensure => 'present',
     source => 'puppet:///modules/openstack-ci-config/zuul/layout.yaml'
   }
+  file { "/etc/zuul/openstack_functions.py":
+    ensure => 'present',
+    source => 'puppet:///modules/openstack-ci-config/zuul/openstack_functions.py'
+  }
   file { "/etc/zuul/logging.conf":
     ensure => 'present',
     source => 'puppet:///modules/openstack-ci-config/zuul/logging.conf'

modules/jenkins_jobs/files/modules/properties.py

@@ -56,6 +56,7 @@ class Properties(object):
         'bool': 'hudson.model.BooleanParameterDefinition',
         'file': 'hudson.model.FileParameterDefinition',
         'text': 'hudson.model.TextParameterDefinition',
+        'label': 'org.jvnet.jenkins.plugins.nodelabelparameter.LabelParameterDefinition',
         # Others require more work
         }
 

modules/jenkins_jobs/files/projects/openstack/devstack-gate.yml

@@ -45,6 +45,12 @@ logrotate:
 triggers:
   - zuul
 
+parameters:
+  - name: NODE_LABEL
+    description: Label of node to use for this build
+    type: label
+    default: devstack-precise
+
 builders:
   - trigger_builds:
     - project: devstack-update-inprogress
@@ -111,6 +117,12 @@ logrotate:
 triggers:
   - zuul
 
+parameters:
+  - name: NODE_LABEL
+    description: Label of node to use for this build
+    type: label
+    default: devstack-precise
+
 builders:
   - trigger_builds:
     - project: devstack-update-inprogress

modules/openstack-ci-config/files/zuul/layout.yaml

@@ -1,3 +1,6 @@
+includes:
+  - python-file: openstack_functions.py
+
 queues:
   - name: check
     manager: IndependentQueueManager
@@ -47,6 +50,8 @@ queues:
 jobs:
   - name: ^.*-merge$
     failure-message: This change was unable to be automatically merged with the current state of the repository. Please rebase your change and upload a new patchset.
+  - name: gate-tempest-devstack-vm
+    parameter-function: devstack_params
 
 
 projects:

modules/openstack-ci-config/files/zuul/openstack_functions.py

@@ -0,0 +1,3 @@
+def devstack_params(change, params):
+    if change.branch == 'stable/diablo':
+        params['NODE'] = 'devstack-oneiric'