diff options
| author | Steven Dake <stdake@cisco.com> | 2015-08-28 19:28:48 -0700 |
|---|---|---|
| committer | Steven Dake <stdake@cisco.com> | 2015-08-29 02:12:20 -0700 |
| commit | 730276aaf96cc6915b0fc4b2d08e366c7568338e (patch) | |
| tree | 9ee8471ebbe9866950130d674aa65234eec87dab /tests | |
| parent | 8372adcf77338cc6370a78e588a9b2d2c08c08b0 (diff) | |
| download | kolla-730276aaf96cc6915b0fc4b2d08e366c7568338e.tar.gz kolla-730276aaf96cc6915b0fc4b2d08e366c7568338e.zip | |
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
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_build.py | 31 |
1 files changed, 7 insertions, 24 deletions
diff --git a/tests/test_build.py b/tests/test_build.py index f4d917e9b..a58327a51 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"]) |