Merge pull request #93 from TomasTomecek/fix-push

push: use the image with metadata

Author: TomasTomecek

ansible_bender/conf.py

@@ -243,7 +243,7 @@ def get_target_image_id(self):
         """
         if self.state not in [BuildState.DONE, BuildState.FAILED]:
             raise RuntimeError(f"Build have not finished yet, it is in state '{self.state.value}'.")
-        return self.get_top_layer_id()
+        return self.final_layer_id
 
     def was_last_layer_cached(self):
         if self.layers:

tests/functional/test_buildah.py

@@ -195,6 +195,13 @@ def test_push_to_dockerd(target_image, tmpdir):
     try:
         cmd = ["docker", "run", "--rm", target, "cat", "/fun"]
         subprocess.check_call(cmd)
+
+        docker_inspect = json.loads(subprocess.check_output(["docker", "inspect", target]))[0]
+        p_inspect = json.loads(subprocess.check_output(
+            ["podman", "inspect", "-t", "image", target_image]))[0]
+        assert docker_inspect["RootFS"]["Layers"] == p_inspect["RootFS"]["Layers"]
+        assert docker_inspect["Created"] == p_inspect["Created"]
+        assert docker_inspect["Id"].endswith(p_inspect["Id"])
     finally:
         subprocess.check_call(["docker", "rmi", target])