aada29b4db
Many tiers have been shed over this issue and frankly enough is enough on this tiering thing, it's tiering us apart! Now we use threading a bit better as well. No more tiers! Puns very much intended. Additionally, this refactors the function names to make inc0 happier and be consistent. We also modify the test_build.py to catch the new statuses introduced by the regex patch. Then we remove the Ubuntu Source from the Docker folder test as that will never ever be functional. Also fixed regex to properly match true regex expressions. Co-Authored-By: Michal Jastrzebski (inc0) <michal.jastrzebski@intel.com> Change-Id: I650fd6af76eddb809756762222e66aefd6fc1dca Partially-Implements: blueprint build-script
102 lines
3.6 KiB
Python
102 lines
3.6 KiB
Python
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
|
|
from mock import patch
|
|
from os import path
|
|
from oslo_log import fixture as log_fixture
|
|
from oslo_log import log as logging
|
|
from oslotest import base
|
|
|
|
import sys
|
|
sys.path.append(path.abspath(path.join(path.dirname(__file__), '../tools')))
|
|
from kolla.cmd import build
|
|
|
|
LOG = logging.getLogger(__name__)
|
|
|
|
|
|
class BuildTest(base.BaseTestCase):
|
|
|
|
def setUp(self):
|
|
super(BuildTest, self).setUp()
|
|
self.useFixture(log_fixture.SetLogLevel([__name__],
|
|
logging.logging.INFO))
|
|
self.build_args = [__name__, "--debug"]
|
|
|
|
def runTest(self):
|
|
with patch.object(sys, 'argv', self.build_args):
|
|
LOG.info("Running with args %s" % self.build_args)
|
|
bad_results, good_results, unmatched_results = build.main()
|
|
|
|
# these are images that are known to not build properly
|
|
excluded_images = ["gnocchi-api",
|
|
"gnocchi-statsd"]
|
|
|
|
failures = 0
|
|
for image, result in bad_results.iteritems():
|
|
if image in excluded_images:
|
|
if result is 'error':
|
|
continue
|
|
failures = failures + 1
|
|
LOG.warning(">>> Expected image '%s' to fail, please update"
|
|
" the excluded_images in source file above if the"
|
|
" image build has been fixed." % image)
|
|
else:
|
|
if result is not 'error':
|
|
continue
|
|
failures = failures + 1
|
|
LOG.critical(">>> Expected image '%s' to succeed!" % image)
|
|
|
|
for image in unmatched_results.keys():
|
|
failures = failures + 1
|
|
LOG.critical(">>> Expected image '%s' to be matched!" % image)
|
|
|
|
self.assertEqual(failures, 0, "%d failure(s) occurred" % failures)
|
|
|
|
|
|
class BuildTestCentosBinaryDocker(BuildTest):
|
|
def setUp(self):
|
|
super(BuildTestCentosBinaryDocker, self).setUp()
|
|
self.build_args.extend(["--base", "centos",
|
|
"--type", "binary"])
|
|
|
|
|
|
class BuildTestCentosSourceDocker(BuildTest):
|
|
def setUp(self):
|
|
super(BuildTestCentosSourceDocker, self).setUp()
|
|
self.build_args.extend(["--base", "centos",
|
|
"--type", "source"])
|
|
|
|
|
|
class BuildTestCentosBinaryTemplate(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()
|
|
self.build_args.extend(["--base", "ubuntu",
|
|
"--type", "source",
|
|
"--template"])
|