From d88d0ead220de0e61140c483785a217f11b66606 Mon Sep 17 00:00:00 2001 From: Luiz Carvalho Date: Mar 09 2020 14:30:20 +0000 Subject: Use info from extra.image location Signed-off-by: Luiz Carvalho --- diff --git a/freshmaker/lightblue.py b/freshmaker/lightblue.py index b1aef6e..8de7f43 100644 --- a/freshmaker/lightblue.py +++ b/freshmaker/lightblue.py @@ -219,6 +219,7 @@ class ContainerImage(dict): if extra_image.get("odcs", {}).get("compose_ids"): data["odcs_compose_ids"] = extra_image["odcs"]["compose_ids"] + data["parent_build_id"] = extra_image.get("parent_build_id") data["parent_image_builds"] = extra_image.get("parent_image_builds") brew_task = session.get_task_request( diff --git a/tests/test_lightblue.py b/tests/test_lightblue.py index 22f094e..a95b74b 100644 --- a/tests/test_lightblue.py +++ b/tests/test_lightblue.py @@ -1275,6 +1275,7 @@ class TestQueryEntityFromLightBlue(helpers.FreshmakerTestCase): "error": None, "arches": None, "odcs_compose_ids": None, + "parent_build_id": None, "parent_image_builds": None, "published": True, "brew": { @@ -1683,12 +1684,22 @@ class TestQueryEntityFromLightBlue(helpers.FreshmakerTestCase): resolve_published): get_build.return_value = { "task_id": 123456, - "parent_build_id": 1074147, - "parent_image_builds": { - "rh-osbs/openshift-golang-builder:1.11": { - "id": 969696, "nvr": "openshift-golang-builder-container-v1.11.13-3.1"}, - "rh-osbs/openshift-ose-base:v4.1.34.20200131.033116": { - "id": 1074147, "nvr": "openshift-enterprise-base-container-v4.1.34-202001310309"}}} + "extra": { + "image": { + "parent_build_id": 1074147, + "parent_image_builds": { + "rh-osbs/openshift-golang-builder:1.11": { + "id": 969696, + "nvr": "openshift-golang-builder-container-v1.11.13-3.1" + }, + "rh-osbs/openshift-ose-base:v4.1.34.20200131.033116": { + "id": 1074147, + "nvr": "openshift-enterprise-base-container-v4.1.34-202001310309" + }, + } + } + } + } get_task_request.return_value = [ "git://example.com/rpms/repo-1#commit_hash1", "target1", {}] exists.return_value = True