openstack/kolla-ansible
Code Issues Proposed changes

Remove deprecated --template option from gating

Browse Source 
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
This commit is contained in:
Steven Dake 2015-08-28 19:28:48 -07:00
parent 8372adcf77
commit 730276aaf9
2 changed files with 10 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
tests/test_build.py
View File

@ -63,39 +63,22 @@ class BuildTest(base.BaseTestCase):
self.assertEqual(failures, 0, "%d failure(s) occurred" % failures) self.assertEqual(failures, 0, "%d failure(s) occurred" % failures)
class BuildTestCentosBinaryDocker(BuildTest): class BuildTestCentosBinary(BuildTest):
def setUp(self): def setUp(self):
super(BuildTestCentosBinaryDocker, self).setUp() super(BuildTestCentosBinary, self).setUp()
self.build_args.extend(["--base", "centos", self.build_args.extend(["--base", "centos",
"--type", "binary"]) "--type", "binary"])
class BuildTestCentosSourceDocker(BuildTest): class BuildTestCentosSource(BuildTest):
def setUp(self): def setUp(self):
super(BuildTestCentosSourceDocker, self).setUp() super(BuildTestCentosSource, self).setUp()
self.build_args.extend(["--base", "centos", self.build_args.extend(["--base", "centos",
"--type", "source"]) "--type", "source"])
class BuildTestCentosBinaryTemplate(BuildTest): class BuildTestUbuntuSource(BuildTest):
def setUp(self): def setUp(self):
super(BuildTestCentosBinaryTemplate, self).setUp() super(BuildTestUbuntuSource, 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()
self.build_args.extend(["--base", "ubuntu", self.build_args.extend(["--base", "ubuntu",
"--type", "source", "--type", "source"])
"--template"])

6
tox.ini
View File

@ -40,7 +40,7 @@ whitelist_externals = find
commands = commands =
find . -type f -name "*.pyc" -delete find . -type f -name "*.pyc" -delete
bash -c "if [ ! -d .testrepository ]; then testr init; fi" 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 # deprecated
[testenv:images-centos-source] [testenv:images-centos-source]
@ -50,7 +50,7 @@ whitelist_externals = find
commands = commands =
find . -type f -name "*.pyc" -delete find . -type f -name "*.pyc" -delete
bash -c "if [ ! -d .testrepository ]; then testr init; fi" 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] [testenv:images-ubuntu-source]
whitelist_externals = find whitelist_externals = find
@ -59,7 +59,7 @@ whitelist_externals = find
commands = commands =
find . -type f -name "*.pyc" -delete find . -type f -name "*.pyc" -delete
bash -c "if [ ! -d .testrepository ]; then testr init; fi" 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] [testenv:images-centos-binary-docker]
whitelist_externals = find whitelist_externals = find