From 67c9194ec8edc4a2216e8fb4970063fb6c9ad324 Mon Sep 17 00:00:00 2001
From: Julien Danjou <julien@danjou.info>
Date: Tue, 20 Nov 2012 12:05:55 +0100
Subject: [PATCH] Run tests against Folsom for Ceilometer

We want to keep the compatibility with Folsom so we run tests using versions
of our dependencies bound to this version.

Change-Id: Ia7af8207d004cbe809add790d467637e81bfb866
Signed-off-by: Julien Danjou <julien@danjou.info>
Reviewed-on: https://review.openstack.org/16520
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Reviewed-by: Doug Hellmann <doug.hellmann@dreamhost.com>
Reviewed-by: Monty Taylor <mordred@inaugust.com>
Approved: James E. Blair <corvus@inaugust.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
---
 .../jenkins_job_builder/config/macros.yaml    | 10 ++++
 .../config/python-jobs.yaml                   | 50 +++++++++++++++++++
 .../openstack_project/files/zuul/layout.yaml  |  4 ++
 3 files changed, 64 insertions(+)

diff --git a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
index f0200dc15f..9a9244a23b 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
@@ -88,6 +88,16 @@
     builders:
       - shell: "/usr/local/jenkins/slave_scripts/run-tox.sh 27"
 
+- builder:
+    name: python26-folsom
+    builders:
+      - shell: "/usr/local/jenkins/slave_scripts/run-tox.sh 26-folsom"
+
+- builder:
+    name: python27-folsom
+    builders:
+      - shell: "/usr/local/jenkins/slave_scripts/run-tox.sh 27-folsom"
+
 - builder:
     name: tarball
     builders:
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 35f511f8b6..9940a98fcc 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
@@ -78,6 +78,29 @@
     # >= precise does not have python2.6
     node: oneiric
 
+- job-template:
+    name: 'gate-{name}-python26-folsom'
+
+    triggers:
+      - zuul
+
+    builders:
+      - gerrit-git-prep
+      - python26-folsom
+
+    publishers:
+      - scp:
+          site: 'static.openstack.org'
+          files:
+            - target: 'logs/$ZUUL_CHANGE/$ZUUL_PATCHSET/$ZUUL_PIPELINE/$JOB_NAME/$BUILD_NUMBER'
+              source: '**/*nose_results.html'
+              keep-hierarchy: false
+              copy-after-failure: true
+      - console-log
+
+    # >= precise does not have python2.6
+    node: oneiric
+
 
 - job-template:
     name: 'gate-{name}-python27'
@@ -107,6 +130,33 @@
 
     node: '{node}'
 
+- job-template:
+    name: 'gate-{name}-python27-folsom'
+
+    parameters:
+      - label:
+          name: NODE_LABEL
+          description: Label of node to use for this build
+          default: '{node}'
+
+    triggers:
+      - zuul
+
+    builders:
+      - gerrit-git-prep
+      - python27-folsom
+
+    publishers:
+      - scp:
+          site: 'static.openstack.org'
+          files:
+            - target: 'logs/$ZUUL_CHANGE/$ZUUL_PATCHSET/$ZUUL_PIPELINE/$JOB_NAME/$BUILD_NUMBER'
+              source: '**/*nose_results.html'
+              keep-hierarchy: false
+              copy-after-failure: true
+      - console-log
+
+    node: '{node}'
 
 - job-template:
     name: 'gate-{name}-merge'
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 18fb983e32..b81102d1da 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -640,11 +640,15 @@ projects:
         - gate-ceilometer-pep8
         - gate-ceilometer-python26
         - gate-ceilometer-python27
+        - gate-ceilometer-python26-folsom
+        - gate-ceilometer-python27-folsom
     gate:
       - gate-ceilometer-merge:
         - gate-ceilometer-pep8
         - gate-ceilometer-python26
         - gate-ceilometer-python27
+        - gate-ceilometer-python26-folsom
+        - gate-ceilometer-python27-folsom
     post:
       - ceilometer-tarball
       - ceilometer-coverage