Merge "Fix kolla-build return codes"

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()

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):