From 93e67ed0f0c7d480e2b16bc9f7aa4496dc15319b Mon Sep 17 00:00:00 2001
From: thomasmckay <thomasmckay@redhat.com>
Date: Wed, 7 Jul 2021 12:21:18 -0400
Subject: [PATCH] mirror: Do not store signatures on repo mirroring
 (PROJQUAY-2167) (#816)

Newer versions of skopeo attempt to store signatures locally. This change prevents copying signatures during repo mirroring.

(cherry picked from commit 95ec9478fc6b66f8b87ddcb699c6496f1661c15c)
---
 util/repomirror/skopeomirror.py                        | 1 +
 workers/repomirrorworker/test/test_repomirrorworker.py | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/util/repomirror/skopeomirror.py b/util/repomirror/skopeomirror.py
index 87b94d348e..e8af7aff21 100644
--- a/util/repomirror/skopeomirror.py
+++ b/util/repomirror/skopeomirror.py
@@ -40,6 +40,7 @@ def copy(
         args = args + [
             "copy",
             "--all",
+            "--remove-signatures",
             "--src-tls-verify=%s" % src_tls_verify,
             "--dest-tls-verify=%s" % dest_tls_verify,
         ]
diff --git a/workers/repomirrorworker/test/test_repomirrorworker.py b/workers/repomirrorworker/test/test_repomirrorworker.py
index 1b85565f74..26b84564d8 100644
--- a/workers/repomirrorworker/test/test_repomirrorworker.py
+++ b/workers/repomirrorworker/test/test_repomirrorworker.py
@@ -98,6 +98,7 @@ def test_successful_mirror(run_skopeo_mock, initialized_db, app):
                 "/usr/bin/skopeo",
                 "copy",
                 "--all",
+                "--remove-signatures",
                 "--src-tls-verify=False",
                 "--dest-tls-verify=True",
                 "--dest-creds",
@@ -156,6 +157,7 @@ def test_successful_disabled_sync_now(run_skopeo_mock, initialized_db, app):
                 "/usr/bin/skopeo",
                 "copy",
                 "--all",
+                "--remove-signatures",
                 "--src-tls-verify=True",
                 "--dest-tls-verify=True",
                 "--dest-creds",
@@ -213,6 +215,7 @@ def test_successful_mirror_verbose_logs(run_skopeo_mock, initialized_db, app, mo
                 "--debug",
                 "copy",
                 "--all",
+                "--remove-signatures",
                 "--src-tls-verify=True",
                 "--dest-tls-verify=True",
                 "--dest-creds",
@@ -277,6 +280,7 @@ def test_rollback(run_skopeo_mock, initialized_db, app):
                 "/usr/bin/skopeo",
                 "copy",
                 "--all",
+                "--remove-signatures",
                 "--src-tls-verify=True",
                 "--dest-tls-verify=True",
                 "--dest-creds",
@@ -292,6 +296,7 @@ def test_rollback(run_skopeo_mock, initialized_db, app):
                 "/usr/bin/skopeo",
                 "copy",
                 "--all",
+                "--remove-signatures",
                 "--src-tls-verify=True",
                 "--dest-tls-verify=True",
                 "--dest-creds",
@@ -307,6 +312,7 @@ def test_rollback(run_skopeo_mock, initialized_db, app):
                 "/usr/bin/skopeo",
                 "copy",
                 "--all",
+                "--remove-signatures",
                 "--src-tls-verify=True",
                 "--dest-tls-verify=True",
                 "--dest-creds",
@@ -388,6 +394,7 @@ def test_mirror_config_server_hostname(run_skopeo_mock, initialized_db, app, mon
                 "--debug",
                 "copy",
                 "--all",
+                "--remove-signatures",
                 "--src-tls-verify=True",
                 "--dest-tls-verify=True",
                 "--dest-creds",
@@ -452,6 +459,7 @@ def test_quote_params(run_skopeo_mock, initialized_db, app):
                 "/usr/bin/skopeo",
                 "copy",
                 "--all",
+                "--remove-signatures",
                 "--src-tls-verify=True",
                 "--dest-tls-verify=True",
                 "--dest-creds",
@@ -515,6 +523,7 @@ def test_quote_params_password(run_skopeo_mock, initialized_db, app):
                 "/usr/bin/skopeo",
                 "copy",
                 "--all",
+                "--remove-signatures",
                 "--src-tls-verify=True",
                 "--dest-tls-verify=True",
                 "--dest-creds",