Merge "Prepare for gating by distro, type, docker type"

1 files changed, 58 insertions, 2 deletions

diff --git a/tox.ini b/tox.ini
index f6468cd6b..4673d4e15 100644
--- a/tox.ini
+++ b/tox.ini
@@ -42,6 +42,7 @@ commands =
    sudo -g docker testr run ^(test_images).*
    bash -c "if [ -f buildconf.bak ]; then mv buildconf.bak .buildconf; fi"
 
+# deprecated
 [testenv:images-centos-binary]
 whitelist_externals = find
                       bash
@@ -49,8 +50,9 @@ 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.BuildTestCentosBinary
+   sudo -g docker testr run test_build.BuildTestCentosBinaryDocker
 
+# deprecated
 [testenv:images-centos-source]
 whitelist_externals = find
                       bash
@@ -58,7 +60,61 @@ 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.BuildTestCentosSource
+   sudo -g docker testr run test_build.BuildTestCentosSourceDocker
+
+[testenv:images-centos-binary-docker]
+whitelist_externals = find
+                      bash
+                      sudo
+commands =
+   find . -type f -name "*.pyc" -delete
+   bash -c "if [ ! -d .testrepository ]; then testr init; fi"
+   sudo -g docker testr run test_build.BuildTestCentosBinaryDocker
+
+[testenv:images-centos-source-docker]
+whitelist_externals = find
+                      bash
+                      sudo
+commands =
+   find . -type f -name "*.pyc" -delete
+   bash -c "if [ ! -d .testrepository ]; then testr init; fi"
+   sudo -g docker testr run test_build.BuildTestCentosSourceDocker
+
+[testenv:images-ubuntu-source-docker]
+whitelist_externals = find
+                      bash
+                      sudo
+commands =
+   find . -type f -name "*.pyc" -delete
+   bash -c "if [ ! -d .testrepository ]; then testr init; fi"
+   sudo -g docker testr run test_build.BuildTestUbuntuSourceDocker
+
+[testenv:images-centos-binary-template]
+whitelist_externals = find
+                      bash
+                      sudo
+commands =
+   find . -type f -name "*.pyc" -delete
+   bash -c "if [ ! -d .testrepository ]; then testr init; fi"
+   sudo -g docker testr run test_build.BuildTestCentosBinaryTemplate
+
+[testenv:images-centos-source-template]
+whitelist_externals = find
+                      bash
+                      sudo
+commands =
+   find . -type f -name "*.pyc" -delete
+   bash -c "if [ ! -d .testrepository ]; then testr init; fi"
+   sudo -g docker testr run test_build.BuildTestCentosSourceTemplate
+
+[testenv:images-ubuntu-source-template]
+whitelist_externals = find
+                      bash
+                      sudo
+commands =
+   find . -type f -name "*.pyc" -delete
+   bash -c "if [ ! -d .testrepository ]; then testr init; fi"
+   sudo -g docker testr run test_build.BuildTestUbuntuSourceTemplate
 
 [testenv:startenv]
 whitelist_externals = bash