diff --git a/tests/test_build.py b/tests/test_build.py index b09c431ab1..4f26940d26 100644 --- a/tests/test_build.py +++ b/tests/test_build.py @@ -88,6 +88,17 @@ class BuildTestCentosSource(BuildTest, base.BaseTestCase): "--type", "source"]) +class BuildTestUbuntuBinary(BuildTest, base.BaseTestCase): + excluded_images = ["mistral-base", + "magnum-base", + "zaqar"] + + def setUp(self): + super(BuildTestUbuntuBinary, self).setUp() + self.build_args.extend(["--base", "ubuntu", + "--type", "binary"]) + + class BuildTestUbuntuSource(BuildTest, base.BaseTestCase): excluded_images = [] @@ -141,6 +152,12 @@ class DeployTestOracleLinuxSource(BuildTestOracleLinuxSource): self.build_args.extend(["--profile", "gate"]) +class DeployTestUbuntuBinary(BuildTestUbuntuBinary): + def setUp(self): + super(DeployTestUbuntuBinary, self).setUp() + self.build_args.extend(["--profile", "gate"]) + + class DeployTestUbuntuSource(BuildTestUbuntuSource): def setUp(self): super(DeployTestUbuntuSource, self).setUp() diff --git a/tox.ini b/tox.ini index eaddde96af..d3cda4bc29 100644 --- a/tox.ini +++ b/tox.ini @@ -61,6 +61,17 @@ commands = testr run test_build.BuildTestCentosSource {toxinidir}/tools/dump_info.sh +[testenv:build-ubuntu-binary] +whitelist_externals = find + bash +setenv = + DOCKER_BUILD_TEST=1 +commands = + find . -type f -name "*.pyc" -delete + bash -c "if [ ! -d .testrepository ]; then testr init; fi" + testr run test_build.BuildTestUbuntuBinary + {toxinidir}/tools/dump_info.sh + [testenv:build-ubuntu-source] whitelist_externals = find bash @@ -146,6 +157,18 @@ commands = sudo {toxinidir}/tools/deploy_aio.sh oraclelinux source {toxinidir}/tools/dump_info.sh +[testenv:deploy-ubuntu-binary] +whitelist_externals = find + bash +setenv = + DOCKER_BUILD_TEST=1 +commands = + find . -type f -name "*.pyc" -delete + bash -c "if [ ! -d .testrepository ]; then testr init; fi" + testr run test_build.DeployTestUbuntuBinary + sudo {toxinidir}/tools/deploy_aio.sh ubuntu binary + {toxinidir}/tools/dump_info.sh + [testenv:deploy-ubuntu-source] whitelist_externals = find bash