From 730276aaf96cc6915b0fc4b2d08e366c7568338e Mon Sep 17 00:00:00 2001
From: Steven Dake <stdake@cisco.com>
Date: Fri, 28 Aug 2015 19:28:48 -0700
Subject: [PATCH] Remove deprecated --template option from gating

The template option is deprecated and --template is now default.
Also rename the tox jobs test calls since we won't have Docker
build operations.

Change-Id: I99df9c337680003e042e7e56a19d6cae2a59ed74
Partially-Implements: blueprint gate-source-builds
---
 tests/test_build.py | 31 +++++++------------------------
 tox.ini             |  6 +++---
 2 files changed, 10 insertions(+), 27 deletions(-)

diff --git a/tests/test_build.py b/tests/test_build.py
index f4d917e9ba..a58327a510 100644
--- a/tests/test_build.py
+++ b/tests/test_build.py
@@ -63,39 +63,22 @@ class BuildTest(base.BaseTestCase):
         self.assertEqual(failures, 0, "%d failure(s) occurred" % failures)
 
 
-class BuildTestCentosBinaryDocker(BuildTest):
+class BuildTestCentosBinary(BuildTest):
     def setUp(self):
-        super(BuildTestCentosBinaryDocker, self).setUp()
+        super(BuildTestCentosBinary, self).setUp()
         self.build_args.extend(["--base", "centos",
                                 "--type", "binary"])
 
 
-class BuildTestCentosSourceDocker(BuildTest):
+class BuildTestCentosSource(BuildTest):
     def setUp(self):
-        super(BuildTestCentosSourceDocker, self).setUp()
+        super(BuildTestCentosSource, self).setUp()
         self.build_args.extend(["--base", "centos",
                                 "--type", "source"])
 
 
-class BuildTestCentosBinaryTemplate(BuildTest):
+class BuildTestUbuntuSource(BuildTest):
     def setUp(self):
-        super(BuildTestCentosBinaryTemplate, self).setUp()
-        self.build_args.extend(["--base", "centos",
-                                "--type", "binary",
-                                "--template"])
-
-
-class BuildTestCentosSourceTemplate(BuildTest):
-    def setUp(self):
-        super(BuildTestCentosSourceTemplate, self).setUp()
-        self.build_args.extend(["--base", "centos",
-                                "--type", "source",
-                                "--template"])
-
-
-class BuildTestUbuntuSourceTemplate(BuildTest):
-    def setUp(self):
-        super(BuildTestUbuntuSourceTemplate, self).setUp()
+        super(BuildTestUbuntuSource, self).setUp()
         self.build_args.extend(["--base", "ubuntu",
-                                "--type", "source",
-                                "--template"])
+                                "--type", "source"])
diff --git a/tox.ini b/tox.ini
index a35748db1a..d7c1788f04 100644
--- a/tox.ini
+++ b/tox.ini
@@ -40,7 +40,7 @@ whitelist_externals = find
 commands =
    find . -type f -name "*.pyc" -delete
    bash -c "if [ ! -d .testrepository ]; then testr init; fi"
-   sudo -g docker testr run test_build.BuildTestCentosBinaryTemplate
+   sudo -g docker testr run test_build.BuildTestCentosBinary
 
 # deprecated
 [testenv:images-centos-source]
@@ -50,7 +50,7 @@ whitelist_externals = find
 commands =
    find . -type f -name "*.pyc" -delete
    bash -c "if [ ! -d .testrepository ]; then testr init; fi"
-   sudo -g docker testr run test_build.BuildTestCentosSourceTemplate
+   sudo -g docker testr run test_build.BuildTestCentosSource
 
 [testenv:images-ubuntu-source]
 whitelist_externals = find
@@ -59,7 +59,7 @@ whitelist_externals = find
 commands =
    find . -type f -name "*.pyc" -delete
    bash -c "if [ ! -d .testrepository ]; then testr init; fi"
-   sudo -g docker testr run test_build.BuildTestUbuntuSourceTemplate
+   sudo -g docker testr run test_build.BuildTestUbuntuSource
 
 [testenv:images-centos-binary-docker]
 whitelist_externals = find