From 68c04f7576cd4a05cc886ab9ba118dd2e34e6958 Mon Sep 17 00:00:00 2001
From: Joshua Harlow <harlowja@yahoo-inc.com>
Date: Fri, 22 Aug 2014 14:23:26 -0700
Subject: [PATCH] Switch taskflow to use the unittests slave script

Instead of using the tox slave script which doesn't report back
very meaningful (if any) testr results to review system use the
unittests one which does provide this information just like the
standard jobs.

Closes-Bug: 1273850

Change-Id: I11ff92ed719f665064336a1fcf8111d1d652e991
---
 .../jenkins_job_builder/config/macros.yaml    |  8 +++++++
 .../jenkins_job_builder/config/projects.yaml  |  9 ++++----
 .../config/python-jobs.yaml                   | 21 +++++++++++++++++++
 .../openstack_project/files/zuul/layout.yaml  |  8 +++----
 4 files changed, 38 insertions(+), 8 deletions(-)

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 7895b7fb34..5a831fc55a 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
@@ -219,6 +219,14 @@
     builders:
       - shell: "/usr/local/jenkins/slave_scripts/run-tox.sh {envlist}"
 
+- builder:
+    name: unittests
+    builders:
+      # NOTE(harlowja): the 'py' prefix will be added on automatically to the
+      # {envlist} by the internals of the run-unittests.sh script (so make
+      # sure you don't include it yourself).
+      - shell: "/usr/local/jenkins/slave_scripts/run-unittests.sh {envlist}"
+
 - builder:
     name: assert-no-extra-files
     builders:
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 665b005bc8..5748dfbfbb 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -2313,11 +2313,12 @@
       - python-jobs
       - openstack-publish-jobs
       - pypi-jobs
-      - gate-{name}-tox-{envlist}:
-          envlist: py26-sa7-mysql
+      - gate-{name}-unittests-{envlist}:
+          # NOTE(harlowja): the 'py' prefix will be added on automatically.
+          envlist: "26-sa7-mysql"
           node: bare-centos6
-      - gate-{name}-tox-{envlist}:
-          envlist: py27-sa8-mysql
+      - gate-{name}-unittests-{envlist}:
+          envlist: "27-sa8-mysql"
 
 - project:
     name: cl-openstack-client
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 5423011360..b622c826b5 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
@@ -201,6 +201,27 @@
 
     node: '{node}'
 
+- job-template:
+    name: 'gate-{name}-unittests-{envlist}'
+
+    wrappers:
+      - build-timeout:
+          timeout: 40
+      - timestamps
+
+    builders:
+      - revoke-sudo
+      - gerrit-git-prep
+      - unittests:
+          envlist: '{envlist}'
+      - assert-no-extra-files
+
+    publishers:
+      - test-results
+      - console-log
+
+    node: '{node}'
+
 - job-template:
     name: '{name}-tarball'
     node: 'bare-precise || bare-trusty'
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 5c465147e9..43c5799a4e 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -1327,11 +1327,11 @@ projects:
       - name: integrated-gate
       - name: publish-to-pypi
     check:
-      - gate-taskflow-tox-py26-sa7-mysql
-      - gate-taskflow-tox-py27-sa8-mysql
+      - gate-taskflow-unittests-26-sa7-mysql
+      - gate-taskflow-unittests-27-sa8-mysql
     gate:
-      - gate-taskflow-tox-py26-sa7-mysql
-      - gate-taskflow-tox-py27-sa8-mysql
+      - gate-taskflow-unittests-26-sa7-mysql
+      - gate-taskflow-unittests-27-sa8-mysql
 
   - name: openstack/trove
     template: