From 19223c2b82978dc63b014b2cdd8363b023cf22b0 Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Tue, 6 Aug 2013 01:10:33 +0000
Subject: [PATCH] Make the python33 template part of python-jobs

* .../files/jenkins_job_builder/config/projects.yaml: Remove the
gate-{name}-python33 template from projects which employ the
python-jobs group.

* .../files/jenkins_job_builder/config/python-jobs.yaml: Add the
gate-{name}-python33 template to the python-jobs group.

Change-Id: Ia745e3205a1be01bd49b44699106d90c7342fae4
---
 .../files/jenkins_job_builder/config/projects.yaml           | 5 -----
 .../files/jenkins_job_builder/config/python-jobs.yaml        | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

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 5f4531b678..9f12f2add9 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -170,7 +170,6 @@
     jobs:
       - python-jobs
       - pypi-jobs
-      - gate-{name}-python33
       - gate-hacking-integration-{target-project}:
           target-org: openstack
           target-project: nova
@@ -186,7 +185,6 @@
     jobs:
       - openstack-publish-jobs
       - python-jobs
-      - gate-{name}-python33
       - pypi-jobs
 
 
@@ -492,7 +490,6 @@
 
     jobs:
       - python-jobs
-      - gate-{name}-python33
       - openstack-publish-jobs
       - pypi-jobs
       - gate-{name}-pyflakes
@@ -717,7 +714,6 @@
 
     jobs:
       - python-jobs
-      - gate-{name}-python33
 
 
 - project:
@@ -1091,7 +1087,6 @@
 
     jobs:
       - python-jobs
-      - gate-{name}-python33
 
 - project:
     name: cookbook-openstack-common
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/python-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/python-jobs.yaml
index b0a0e2f1bb..ddc590bdee 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/python-jobs.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/python-jobs.yaml
@@ -213,10 +213,10 @@
       - 'gate-{name}-pep8'
       - 'gate-{name}-python26'
       - 'gate-{name}-python27'
+      - 'gate-{name}-python33'
       - 'gate-{name}-docs'
       - 'gate-{name}-requirements'
       - '{name}-tarball'
       - '{name}-branch-tarball'
       # pyflakes isn't standard
       # pylint isn't standard
-      # py33.3 isn't standard