From 79d9951634285faeebb08d232502a1c47a5ef1dc Mon Sep 17 00:00:00 2001
From: Steven Dake <stdake@cisco.com>
Date: Sun, 16 Aug 2015 13:01:08 -0700
Subject: Prepare for gating by distro, type, docker type

We will gate on all combos of:
/docker
/docker_templates
Centos
Ubuntu
Binary
Source

Except for Ubuntu + Binary because there is no delorean
style repository for Ubuntu.

Change-Id: Ic1ed8c22c2f86ff339299939da9ac492a7c7c5f5
Partially-Impelements: blueprint gate-source-builds
---
 tests/test_build.py | 35 +++++++++++++++++++++++++----------
 1 file changed, 25 insertions(+), 10 deletions(-)

(limited to 'tests')

diff --git a/tests/test_build.py b/tests/test_build.py
index 03a15e6c4..1dc25cbd2 100644
--- a/tests/test_build.py
+++ b/tests/test_build.py
@@ -60,31 +60,46 @@ class BuildTest(base.BaseTestCase):
         self.assertEqual(failures, 0, "%d failure(s) occurred" % failures)
 
 
-class BuildTestCentosBinary(BuildTest):
+class BuildTestCentosBinaryDocker(BuildTest):
     def setUp(self):
-        super(BuildTestCentosBinary, self).setUp()
+        super(BuildTestCentosBinaryDocker, self).setUp()
         self.build_args.extend(["--base", "centos",
                                 "--type", "binary"])
 
 
-class BuildTestTemplateCentosBinary(BuildTest):
+class BuildTestCentosSourceDocker(BuildTest):
     def setUp(self):
-        super(BuildTestCentosBinary, self).setUp()
+        super(BuildTestCentosSourceDocker, self).setUp()
+        self.build_args.extend(["--base", "centos",
+                                "--type", "source"])
+
+
+class BuildTestUbuntuSourceDocker(BuildTest):
+    def setUp(self):
+        super(BuildTestUbuntuSourceDocker, self).setUp()
+        self.build_args.extend(["--base", "ubuntu",
+                                "--type", "source"])
+
+
+class BuildTestCentosBinaryTemplate(BuildTest):
+    def setUp(self):
+        super(BuildTestCentosBinaryTemplate, self).setUp()
         self.build_args.extend(["--base", "centos",
                                 "--type", "binary",
                                 "--template"])
 
 
-class BuildTestCentosSource(BuildTest):
+class BuildTestCentosSourceTemplate(BuildTest):
     def setUp(self):
-        super(BuildTestCentosSource, self).setUp()
+        super(BuildTestCentosSourceTemplate, self).setUp()
         self.build_args.extend(["--base", "centos",
-                                "--type", "source"])
+                                "--type", "source",
+                                "--template"])
 
 
-class BuildTestTemplateCentosSource(BuildTest):
+class BuildTestUbuntuSourceTemplate(BuildTest):
     def setUp(self):
-        super(BuildTestCentosSource, self).setUp()
-        self.build_args.extend(["--base", "centos",
+        super(BuildTestUbuntuSourceTemplate, self).setUp()
+        self.build_args.extend(["--base", "ubuntu",
                                 "--type", "source",
                                 "--template"])
-- 
cgit v1.2.3