From 856ca2b2e8d6dd129a242a0baaab06119246b313 Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@hp.com>
Date: Thu, 2 Aug 2012 13:04:00 -0700
Subject: [PATCH] Use oneiric for stable/diablo.

For all python27 jobs, use oneiric slaves if the branch is
stable/diablo.  Python26 jobs are already on oneiric due to
lack of python 2.6 on anything later.

Change-Id: Id440e14721ccdd4225c5e5b170510c3c000a36b3
---
 modules/jenkins_jobs/files/templates/python_jobs.yml        | 6 ++++++
 modules/openstack_project/files/zuul/layout.yaml            | 2 ++
 modules/openstack_project/files/zuul/openstack_functions.py | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/modules/jenkins_jobs/files/templates/python_jobs.yml b/modules/jenkins_jobs/files/templates/python_jobs.yml
index a43b4b3a7b..1cc1fd9486 100644
--- a/modules/jenkins_jobs/files/templates/python_jobs.yml
+++ b/modules/jenkins_jobs/files/templates/python_jobs.yml
@@ -116,6 +116,12 @@ logrotate:
   artifactDaysToKeep: -1
   artifactNumToKeep: -1
 
+parameters:
+  - name: NODE_LABEL
+    description: Label of node to use for this build
+    type: label
+    default: '@NODE@'
+
 triggers:
   - zuul
 
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index ce50f3e0c9..15e8dd769f 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -53,6 +53,8 @@ jobs:
     hold-following-changes: true
   - name: gate-tempest-devstack-vm
     parameter-function: devstack_params
+  - name: ^.*-python27$
+    parameter-function: python27_params
 
 
 projects:
diff --git a/modules/openstack_project/files/zuul/openstack_functions.py b/modules/openstack_project/files/zuul/openstack_functions.py
index 6837ccac5b..6692026770 100644
--- a/modules/openstack_project/files/zuul/openstack_functions.py
+++ b/modules/openstack_project/files/zuul/openstack_functions.py
@@ -1,3 +1,7 @@
 def devstack_params(change, params):
     if change.branch == 'stable/diablo':
         params['NODE_LABEL'] = 'devstack-oneiric'
+
+def python27_params(change, params):
+    if change.branch == 'stable/diablo':
+        params['NODE_LABEL'] = 'oneiric'