Merge pull request #17 from neithere/neithere/build_details_url

Log link to build details, don't print JSON [CLOUDDST-2404]

pubtools/iib/iib_ops.py

@@ -241,32 +241,20 @@ def _iib_op_main(args, operation=None, items_final_state="PUSHED"):
     pc.update_push_items(push_items)
 
     build_details = iib_c.wait_for_build(build_details)
+
+    build_details_url = _make_iib_build_details_url(args.iib_server, build_details.id)
+    LOG.info("IIB details: %s", build_details_url)
+
     if build_details.state == "failed":
         LOG.error("IIB operation failed")
         push_items = push_items_from_build(
             build_details, "NOTPUSHED", args.pulp_repository
         )
         pc.update_push_items(push_items)
-        json.dump(
-            build_details.to_dict(),
-            sys.stderr,
-            sort_keys=True,
-            indent=4,
-            separators=(",", ": "),
-        )
-        sys.stderr.write("\n")
         sys.exit(1)
 
     LOG.info("IIB build finished")
     if args.skip_pulp:
-        json.dump(
-            build_details.to_dict(),
-            sys.stdout,
-            sort_keys=True,
-            indent=4,
-            separators=(",", ": "),
-        )
-        sys.stdout.write("\n")
         return build_details
 
     LOG.debug("Getting pulp repository: %s", args.pulp_repository)
@@ -305,14 +293,7 @@ def _iib_op_main(args, operation=None, items_final_state="PUSHED"):
     )
     LOG.info("IIB push finished")
     pc.update_push_items(push_items)
-    json.dump(
-        build_details.to_dict(),
-        sys.stdout,
-        sort_keys=True,
-        indent=4,
-        separators=(",", ": "),
-    )
-    sys.stdout.write("\n")
+
     return build_details
 
 
@@ -344,3 +325,7 @@ def remove_operators_main(sysargs=None):
     process_parsed_args(args, RM_CMD_ARGS)
 
     return _iib_op_main(args, "remove_operators", "DELETED")
+
+
+def _make_iib_build_details_url(host, task_id):
+    return "https://%s/api/v1/builds/%s" % (host, task_id)

tests/test_iib_ops.py

@@ -1,5 +1,4 @@
 import contextlib
-from copy import deepcopy
 import mock
 import pkg_resources
 import pytest
@@ -18,6 +17,9 @@
 from utils import FakeTaskManager, FakeCollector
 
 
+FIXTURE_IIB_SERVER = "iib-server"
+
+
 fake_tm = FakeTaskManager()
 
 operator_1_push_item_pending = {
@@ -141,7 +143,7 @@ def fixture_common_iib_op_args():
         "pulp-user",
         "--pulp-insecure",
         "--iib-server",
-        "iib-server",
+        FIXTURE_IIB_SERVER,
         "--index-image",
         "index-image",
         "--binary-image",
@@ -349,6 +351,8 @@ def test_add_bundles_cli_error(
 
 
 def test_add_bundles_py(
+    caplog,
+    capsys,
     fixture_iib_client,
     fixture_pulp_client,
     fixture_iib_krb_auth,
@@ -391,6 +395,16 @@ def test_add_bundles_py(
 
     fixture_pulplib_repo_publish.assert_called_once()
 
+    task_id = retval.id
+    url_msg = "IIB details: https://{}/api/v1/builds/{}".format(
+        FIXTURE_IIB_SERVER, task_id
+    )
+    assert url_msg in caplog.messages
+
+    # neither build details nor anything else dumped into stdout
+    captured = capsys.readouterr()
+    assert not captured.out
+
 
 def test_add_bundles_py_multiple_bundles(
     fixture_iib_client,