diff options
| author | Will Miller <wmiller@cray.com> | 2016-05-25 04:04:52 -0500 |
|---|---|---|
| committer | Will Miller <wmiller@cray.com> | 2016-05-27 06:39:52 -0500 |
| commit | 18ae114e7557ecc0a5692ea3a22b418df7bba52f (patch) | |
| tree | aee5b9ae6f1964d8502428a80ab8c9c12f1fb0dc | |
| parent | c51e315523fe37f28dc9b0968191b7e07125c24b (diff) | |
| download | kolla-18ae114e7557ecc0a5692ea3a22b418df7bba52f.tar.gz kolla-18ae114e7557ecc0a5692ea3a22b418df7bba52f.zip | |
Fix kolla-build return codes
Add a main wrapper function to return 1 if any images failed to build;
otherwise, return 0. Rename the old main() to run_build(), which still
returns image statuses, to avoid interfering with unit tests.
Change-Id: I5817cc9cebb4f42dc13e0535223e5dc8931a3aab
Co-Authored-By: Mark Goddard <mgoddard@cray.com>
Closes-Bug: #1578404
| -rwxr-xr-x | kolla/cmd/build.py | 10 | ||||
| -rw-r--r-- | tests/test_build.py | 2 |
2 files changed, 10 insertions, 2 deletions
diff --git a/kolla/cmd/build.py b/kolla/cmd/build.py index bbd9788ad..18ff68503 100755 --- a/kolla/cmd/build.py +++ b/kolla/cmd/build.py @@ -737,7 +737,7 @@ class KollaWorker(object): return queue -def main(): +def run_build(): conf = cfg.ConfigOpts() common_config.parse(conf, sys.argv[1:], prog='kolla-build') @@ -791,5 +791,13 @@ def main(): return kolla.get_image_statuses() +def main(): + bad_results, good_results, unmatched_results = run_build() + if len(bad_results): + return 1 + else: + return 0 + + if __name__ == '__main__': main() diff --git a/tests/test_build.py b/tests/test_build.py index f24e6a9fc..64c92dea8 100644 --- a/tests/test_build.py +++ b/tests/test_build.py @@ -43,7 +43,7 @@ class BuildTest(object): 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() + bad_results, good_results, unmatched_results = build.run_build() failures = 0 for image, result in six.iteritems(bad_results): |