From 08e765fc3dc5fe586473583519a878b6020fe09d Mon Sep 17 00:00:00 2001
From: Steven Dake <stdake@cisco.com>
Date: Thu, 27 Aug 2015 17:16:46 -0700
Subject: [PATCH] Start of removal of docker directory

Start off the removal of the docker directory by making the gate
only run against docker templates.  The idea is we are going to
from this patch set forward completely abandon the functioning of
the docker directory and focus on making templates work properly.

In order to facilitate that, this patch set makes sure each change
gates properly for the changed service in the Templates build.

Note because git review and gerrit can't keep history on removal
followed by a git move operation, we first git rm the files affected
then git mv them to get the gate working again.

Every other patch in this patch set will fail the gate.  That is
expected behavior.

Change-Id: I1be2e2638aef4ada038bfe5f3dd563f040542df2
---
 tests/test_build.py | 4 ++--
 tox.ini             | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/tests/test_build.py b/tests/test_build.py
index 6d86c8b7cb..f4d917e9ba 100644
--- a/tests/test_build.py
+++ b/tests/test_build.py
@@ -38,8 +38,8 @@ class BuildTest(base.BaseTestCase):
             bad_results, good_results, unmatched_results = build.main()
 
         # these are images that are known to not build properly
-        excluded_images = ["gnocchi-api",
-                           "gnocchi-statsd"]
+        excluded_images = ["gnocchi-base",
+                           "murano-base"]
 
         failures = 0
         for image, result in bad_results.iteritems():
diff --git a/tox.ini b/tox.ini
index b06657b266..284fa0bc74 100644
--- a/tox.ini
+++ b/tox.ini
@@ -17,7 +17,6 @@ commands =
     {toxinidir}/tools/validate-all-json.sh
     {toxinidir}/tools/validate-all-yaml.sh
     {toxinidir}/tools/validate-all-maintainer.sh
-    {toxinidir}/tools/validate-links.sh
 
 [testenv:bashate]
 deps = bashate
@@ -50,7 +49,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.BuildTestCentosBinaryDocker
+   sudo -g docker testr run test_build.BuildTestCentosBinaryTemplate
 
 # deprecated
 [testenv:images-centos-source]
@@ -60,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.BuildTestCentosSourceDocker
+   sudo -g docker testr run test_build.BuildTestCentosSourceTemplate
 
 [testenv:images-ubuntu-source]
 whitelist_externals = find