Do no pass repo arg to pubtools-sign-msg-contaner-sign (#235)

Pubtools-sign-msg-container-sign doesn't accept repo argument anymore
release-engineering · Mar 5, 2024 · 0b919fa · 0b919fa
1 parent e7941bb
commit 0b919fa
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 17 deletions.
diff --git a/pubtools/_quay/signer_wrapper.py b/pubtools/_quay/signer_wrapper.py
@@ -263,7 +263,7 @@ def sign_container_opt_args(
         Returns:
             dict: Optional arguments for signing a container.
         """
-        return {k: v for k, v in [("task_id", task_id), ("repo", sign_entry.repo)] if v is not None}
+        return {k: v for k, v in [("task_id", task_id)] if v is not None}
 
     @contextmanager
     def _save_signatures_file(self, signatures: List[Dict[str, Any]]) -> Generator[Any, None, None]:

diff --git a/tests/test_iib_operations.py b/tests/test_iib_operations.py
@@ -307,7 +307,6 @@ def test_task_iib_add_bundles(
                     "sha256:bd6eba96070efe86b64b9a212680ca6d46a2e30f0a7d8e539f657eabc45c35a6",
                 ],
                 task_id="1-0",
-                repo="operators/index-image",
             ),
             # cosign
             mock.call(
@@ -421,7 +420,6 @@ def test_task_iib_add_bundles_missing_manifest_list(
                     "sha256:bd6eba96070efe86b64b9a212680ca6d46a2e30f0a7d8e539f657eabc45c35a6",
                 ],
                 task_id="1-0",
-                repo="operators/index-image",
             ),
             # cosign
             mock.call(
@@ -539,7 +537,6 @@ def test_task_iib_add_bundles_operator_ns(
                     "sha256:bd6eba96070efe86b64b9a212680ca6d46a2e30f0a7d8e539f657eabc45c35a6",
                 ],
                 task_id="1-0",
-                repo="operators/index-image",
             ),
             # cosign
             mock.call(
@@ -950,7 +947,6 @@ def test_task_iib_build_from_scratch(
                     "sha256:bd6eba96070efe86b64b9a212680ca6d46a2e30f0a7d8e539f657eabc45c35a6",
                 ],
                 task_id="1-0",
-                repo="operators/index-image",
             ),
             mock.call(
                 config_file="test-config.yml",
@@ -1127,7 +1123,6 @@ def test_task_iib_build_from_scratch_missing_manifest_list(
                     "sha256:bd6eba96070efe86b64b9a212680ca6d46a2e30f0a7d8e539f657eabc45c35a6",
                 ],
                 task_id="1-0",
-                repo="operators/index-image",
             ),
             # cosign
             mock.call(
@@ -1272,7 +1267,6 @@ def test_task_iib_build_from_scratch_operator_ns(
                     "sha256:bd6eba96070efe86b64b9a212680ca6d46a2e30f0a7d8e539f657eabc45c35a6",
                 ],
                 task_id="1-0",
-                repo="operators/index-image",
             ),
             mock.call(
                 config_file="test-config.yml",

diff --git a/tests/test_integration.py b/tests/test_integration.py
@@ -296,7 +296,6 @@ def test_push_docker_multiarch_merge_ml_operator(
                         "sha256:5555555555",
                     ],
                     task_id="1-0",
-                    repo="target/repo",
                 ),
                 # cosign
                 mock.call(
@@ -332,7 +331,6 @@ def test_push_docker_multiarch_merge_ml_operator(
                     ],
                     digest=["sha256:5555555555", "sha256:5555555555"],
                     task_id="1-0",
-                    repo="operators/index-image",
                 ),
                 mock.call(
                     config_file="test-config.yml",
@@ -343,7 +341,6 @@ def test_push_docker_multiarch_merge_ml_operator(
                     ],
                     digest=["sha256:5555555555", "sha256:5555555555"],
                     task_id="1-0",
-                    repo="operators/index-image",
                 ),
                 mock.call(
                     config_file="test-config.yml",
@@ -476,7 +473,6 @@ def test_push_docker_multiarch_simple_workflow(
                         "sha256:5555555555",
                     ],
                     task_id="1-0",
-                    repo="target/repo",
                 ),
                 mock.call(
                     config_file="test-config.yml",
@@ -628,7 +624,6 @@ def mock_fetch_missing_push_items_digests_sf(push_items):
                     ],
                     digest=["fake-digest-0", "fake-digest-0"],
                     task_id="1-0",
-                    repo="target/repo",
                 ),
                 mock.call(
                     config_file="test-config.yml",
@@ -800,7 +795,6 @@ def test_tag_docker_multiarch_merge_ml(
                         "sha256:5555555555",
                     ],
                     task_id="1-0",
-                    repo="namespace/test_repo",
                 ),
                 mock.call(
                     config_file="test-config.yml",
@@ -1001,7 +995,6 @@ def test_tag_docker_source_copy_untag(
                         "sha256:6ef06d8c90c863ba4eb4297f1073ba8cb28c1f6570e2206cdaad2084e2a4715d",
                     ],
                     task_id="1-0",
-                    repo="namespace/test_repo",
                 ),
                 mock.call(
                     config_file="test-config.yml",
@@ -1278,7 +1271,6 @@ def test_task_iib_add_bundles(
                         "sha256:5555555555",
                     ],
                     task_id="1-0",
-                    repo="operators/index-image",
                 ),
                 # cosign
                 mock.call(
@@ -1391,7 +1383,6 @@ def test_task_iib_remove_operators(
                     "sha256:5555555555",
                 ],
                 task_id="1-0",
-                repo="operators/index-image",
             ),
             # cosign
             mock.call(
@@ -1784,7 +1775,6 @@ def test_push_docker_operator_verify_bundle_fail(
                         "sha256:5555555555",
                     ],
                     task_id="1-0",
-                    repo="target/repo",
                 ),
                 mock.call(
                     config_file="test-config.yml",