Add image_size to the compose/info JSON

The size will be 0 until the compose is finished. It will then be set
to the size of the image in bytes.
This commit is contained in:
Brian C. Lane 2018-03-23 16:28:14 -07:00
parent 78c02dd7e7
commit 211f1bf764

View File

@ -245,6 +245,7 @@ def compose_detail(results_dir):
* compose_type - The type of output generated (tar, iso, etc.) * compose_type - The type of output generated (tar, iso, etc.)
* recipe - Recipe name * recipe - Recipe name
* version - Recipe version * version - Recipe version
* image_size - Size of the image, if finished. 0 otherwise.
""" """
build_id = os.path.basename(os.path.abspath(results_dir)) build_id = os.path.basename(os.path.abspath(results_dir))
status = open(joinpaths(results_dir, "STATUS")).read().strip() status = open(joinpaths(results_dir, "STATUS")).read().strip()
@ -463,11 +464,7 @@ def uuid_info(cfg, uuid):
raise RuntimeError("Missing deps.toml for %s" % uuid) raise RuntimeError("Missing deps.toml for %s" % uuid)
deps_dict = toml.loads(open(deps_path, "r").read()) deps_dict = toml.loads(open(deps_path, "r").read())
compose_type = get_compose_type(uuid_dir) details = compose_detail(uuid_dir)
status_path = joinpaths(uuid_dir, "STATUS")
if not os.path.exists(status_path):
raise RuntimeError("Missing status for %s" % uuid)
status = open(status_path).read().strip()
commit_path = joinpaths(uuid_dir, "COMMIT") commit_path = joinpaths(uuid_dir, "COMMIT")
if not os.path.exists(commit_path): if not os.path.exists(commit_path):
@ -479,8 +476,9 @@ def uuid_info(cfg, uuid):
"recipe": frozen_dict, "recipe": frozen_dict,
"commit": commit_id, "commit": commit_id,
"deps": deps_dict, "deps": deps_dict,
"compose_type": compose_type, "compose_type": details["compose_type"],
"queue_status": status "queue_status": details["queue_status"],
"image_size": details["image_size"]
} }
def uuid_tar(cfg, uuid, metadata=False, image=False, logs=False): def uuid_tar(cfg, uuid, metadata=False, image=False, logs=False):