Switch to using run-tox.sh everywhere.

Stop using run-unittests.sh. It creates confusion when people create
jobs. Instead standardize on run-tox.sh. This means rewriting all the
jobs that use run-unittests.sh to use run-tox.sh.

Note that this depends on the parent change to merge first and have all
our slave images rebuilt prior to merging this change.

Change-Id: Ib81403c25485b120f48080a59f1894dc2130c05f

jenkins/jobs/horizon.yaml

@@ -22,7 +22,7 @@
     builders:
       - revoke-sudo
       - gerrit-git-prep
-      - shell: '/usr/local/jenkins/slave_scripts/run-unittests.sh 27dj14'
+      - shell: '/usr/local/jenkins/slave_scripts/run-tox.sh py27dj14'
       - assert-no-extra-files
 
     publishers:

jenkins/jobs/macros.yaml

@@ -229,41 +229,33 @@
 - builder:
     name: python26
     builders:
-      - shell: "/usr/local/jenkins/slave_scripts/run-unittests.sh 26"
+      - shell: "/usr/local/jenkins/slave_scripts/run-tox.sh py26"
 
 - builder:
     name: python27
     builders:
-      - shell: "/usr/local/jenkins/slave_scripts/run-unittests.sh 27"
+      - shell: "/usr/local/jenkins/slave_scripts/run-tox.sh py27"
 
 - builder:
     name: python33
     builders:
-      - shell: "/usr/local/jenkins/slave_scripts/run-unittests.sh 33"
+      - shell: "/usr/local/jenkins/slave_scripts/run-tox.sh py33"
 
 - builder:
     name: python34
     builders:
-      - shell:  "/usr/local/jenkins/slave_scripts/run-unittests.sh 34"
+      - shell:  "/usr/local/jenkins/slave_scripts/run-tox.sh py34"
 
 - builder:
     name: pypy
     builders:
-      - shell: "/usr/local/jenkins/slave_scripts/run-unittests.sh py"
+      - shell: "/usr/local/jenkins/slave_scripts/run-tox.sh pypy"
 
 - builder:
     name: tox
     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:

jenkins/jobs/misc.yaml

@@ -35,21 +35,6 @@
 
     node: '{node}'
 
-- job-template:
-    name: 'gate-{name}-unittests-{env}'
-
-    builders:
-      - revoke-sudo
-      - gerrit-git-prep
-      - shell: '/usr/local/jenkins/slave_scripts/run-unittests.sh {env}'
-      - assert-no-extra-files
-
-    publishers:
-      - test-results
-      - console-log
-
-    node: '{node}'
-
 - job:
     name: 'sandbox-tag'
 

jenkins/jobs/projects.yaml

@@ -1159,12 +1159,11 @@
       - python-jobs
       - openstack-publish-jobs
       - pypi-jobs
-      - gate-{name}-unittests-{envlist}:
+      - gate-{name}-tox-{envlist}:
-          # NOTE(harlowja): the 'py' prefix will be added on automatically.
+          envlist: "py26-sa7-mysql"
-          envlist: "26-sa7-mysql"
           node: bare-centos6
-      - gate-{name}-unittests-{envlist}:
+      - gate-{name}-tox-{envlist}:
-          envlist: "27-sa8-mysql"
+          envlist: "py27-sa8-mysql"
       - 'lib-forward-testing-{name}'
       - 'stable-compat-jobs-{name}'
 
@@ -3659,11 +3658,11 @@
 
     jobs:
       - python-jobs
-      - gate-{name}-unittests-{env}:
+      - gate-{name}-tox-{envlist}:
-          env: 26sa07
+          envlist: py26sa07
           node: bare-centos6
-      - gate-{name}-unittests-{env}:
+      - gate-{name}-tox-{envlist}:
-          env: 27sa07
+          envlist: py27sa07
       - '{pipeline}-sqlalchemy-migrate-devstack-dsvm{branch-designator}':
           pipeline: check
           node: 'devstack-precise || devstack-trusty'

jenkins/jobs/python-jobs.yaml

@@ -200,27 +200,6 @@
 
     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'

zuul/layout.yaml

@@ -2176,11 +2176,11 @@ projects:
       - name: stable-compat-jobs
     check:
       - gate-taskflow-python34
-      - gate-taskflow-unittests-26-sa7-mysql
+      - gate-taskflow-tox-py26-sa7-mysql
-      - gate-taskflow-unittests-27-sa8-mysql
+      - gate-taskflow-tox-py27-sa8-mysql
     gate:
-      - gate-taskflow-unittests-26-sa7-mysql
+      - gate-taskflow-tox-py26-sa7-mysql
-      - gate-taskflow-unittests-27-sa8-mysql
+      - gate-taskflow-tox-py27-sa8-mysql
 
 ########################################################################
 # Section: Other OpenStack projects
@@ -5357,13 +5357,13 @@ projects:
     check:
       - gate-sqlalchemy-migrate-pep8
       - gate-sqlalchemy-migrate-python27
-      - gate-sqlalchemy-migrate-unittests-26sa07
+      - gate-sqlalchemy-migrate-tox-py26sa07
-      - gate-sqlalchemy-migrate-unittests-27sa07
+      - gate-sqlalchemy-migrate-tox-py27sa07
       - check-sqlalchemy-migrate-devstack-dsvm
     gate:
       - gate-sqlalchemy-migrate-python27
-      - gate-sqlalchemy-migrate-unittests-26sa07
+      - gate-sqlalchemy-migrate-tox-py26sa07
-      - gate-sqlalchemy-migrate-unittests-27sa07
+      - gate-sqlalchemy-migrate-tox-py27sa07
     post:
       - sqlalchemy-migrate-branch-tarball