From d21d6ff541327a66c51155e70a68d7a527e43576 Mon Sep 17 00:00:00 2001
From: Roman Podolyaka <rpodolyaka@mirantis.com>
Date: Tue, 30 Jul 2013 17:49:06 +0300
Subject: [PATCH] Modify running of sqlalchemy-migrate tests

sqlalchemy-migrate tests should be run for all Python/SQLAlchemy
versions combinations, we claim to support, which include:
Python versions 2.6.x and 2.7.x, SQLAlchemy versions 0.7.x
and 0.8.x.

py26/py27 tox envs install the latest stable version of SQLAlchemy
(currently, 0.8.x branch), so two additional tox environments and
corresponding Jenkins jobs are added to run the test suite with
SQLAlchemy 0.7.x (for both Python 2.6 and 2.7).

Related change in sqlalchemy-migrate: I50c7009d8b808ce3bbb1f0a27c50f5cb5116cdb3

Change-Id: Iea900c69d35a9c083147f115051d6656d8ea5d24
---
 .../files/jenkins_job_builder/config/misc.yaml     | 14 ++++++++++++++
 .../files/jenkins_job_builder/config/projects.yaml |  4 ++++
 modules/openstack_project/files/zuul/layout.yaml   |  4 ++++
 3 files changed, 22 insertions(+)

diff --git a/modules/openstack_project/files/jenkins_job_builder/config/misc.yaml b/modules/openstack_project/files/jenkins_job_builder/config/misc.yaml
index 2621075235..b29f533d7b 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/misc.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/misc.yaml
@@ -23,3 +23,17 @@
       - console-log
 
     node: '{node}'
+
+- job-template:
+    name: 'gate-{name}-tox-{env}'
+
+    builders:
+      - gerrit-git-prep
+      - shell: '/usr/local/jenkins/slave_scripts/run-tox.sh {env}'
+      - assert-no-extra-files
+
+    publishers:
+      - test-results
+      - console-log
+
+    node: '{node}'
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 9ab241fb18..650ed54b7e 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -106,9 +106,13 @@
     node: precise
     rtfd-id: 1744
     tarball-site: tarballs.openstack.org
+    env:
+        - py26sa07
+        - py27sa07
 
     jobs:
       - python-jobs
+      - gate-{name}-tox-{env}
       - hook-{name}-rtfd
       - pypi-jobs
 
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index f30f28db0d..636ceb9c58 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -2214,9 +2214,13 @@ projects:
     check:
       - gate-sqlalchemy-migrate-python26
       - gate-sqlalchemy-migrate-python27
+      - gate-sqlalchemy-migrate-tox-py26sa07
+      - gate-sqlalchemy-migrate-tox-py27sa07
     gate:
       - gate-sqlalchemy-migrate-python26
       - gate-sqlalchemy-migrate-python27
+      - gate-sqlalchemy-migrate-tox-py26sa07
+      - gate-sqlalchemy-migrate-tox-py27sa07
     post:
       - sqlalchemy-migrate-branch-tarball
       - hook-sqlalchemy-migrate-rtfd