From 386e54a7412b6594b60ece9eb24bd42d433a0207 Mon Sep 17 00:00:00 2001
From: Jindrich Novy <jnovy@redhat.com>
Date: Thu, 23 Jan 2025 13:35:24 +0100
Subject: [PATCH] skopeo-1.17.0-2.el9

- fix 'Skopeo system tests pulling amd64 image on aarch64'
- Related: RHEL-60277

Signed-off-by: Jindrich Novy <jnovy@redhat.com>
---
 2493.patch  | 30 ++++++++++++++++++++++++++++++
 skopeo.spec |  7 ++++++-
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 2493.patch

diff --git a/2493.patch b/2493.patch
new file mode 100644
index 0000000..8438a51
--- /dev/null
+++ b/2493.patch
@@ -0,0 +1,30 @@
+From b5a13bccfddd7eecdb4d046d3abc7519cf0ade0c Mon Sep 17 00:00:00 2001
+From: Paul Holzinger <pholzing@redhat.com>
+Date: Fri, 10 Jan 2025 14:31:12 +0100
+Subject: [PATCH] systemtest: update quay.io registry image
+
+The "2" tag is very old and not a multi arch manifest. As such testing
+on aarch64 failed because it pulled and x86_64 image instead. This was
+found in downstream RHEL testing.
+
+The "2.8.2" is multi arch and used in podman testing were we
+successfully run aarch64 based testing.
+
+Signed-off-by: Paul Holzinger <pholzing@redhat.com>
+---
+ systemtest/helpers.bash | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/systemtest/helpers.bash b/systemtest/helpers.bash
+index 7056235a0f..b18ecc78fc 100644
+--- a/systemtest/helpers.bash
++++ b/systemtest/helpers.bash
+@@ -10,7 +10,7 @@ SKOPEO_BINARY=${SKOPEO_BINARY:-${TEST_SOURCE_DIR}/../bin/skopeo}
+ SKOPEO_TIMEOUT=${SKOPEO_TIMEOUT:-300}
+ 
+ # Default image to run as a local registry
+-REGISTRY_FQIN=${SKOPEO_TEST_REGISTRY_FQIN:-quay.io/libpod/registry:2}
++REGISTRY_FQIN=${SKOPEO_TEST_REGISTRY_FQIN:-quay.io/libpod/registry:2.8.2}
+ 
+ ###############################################################################
+ # BEGIN setup/teardown
diff --git a/skopeo.spec b/skopeo.spec
index ddedc8a..d94b4f6 100644
--- a/skopeo.spec
+++ b/skopeo.spec
@@ -15,7 +15,7 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl
 Epoch: 2
 Name: skopeo
 Version: 1.17.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Inspect container images and repositories on registries
 License: ASL 2.0
 URL: https://%{import_path}
@@ -26,6 +26,7 @@ Source0: https://%{import_path}/tarball/%{commit0}/%{branch}-%{shortcommit0}.tar
 %else
 Source0: https://%{import_path}/archive/%{commit0}/%{name}-%{version}-%{shortcommit0}.tar.gz
 %endif
+Patch0: https://patch-diff.githubusercontent.com/raw/containers/skopeo/pull/2493.patch
 BuildRequires: git-core
 BuildRequires: golang >= 1.20.10
 BuildRequires: /usr/bin/go-md2man
@@ -124,6 +125,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
 %{_datadir}/%{name}/test
 
 %changelog
+* Thu Jan 23 2025 Jindrich Novy <jnovy@redhat.com> - 2:1.17.0-2
+- fix 'Skopeo system tests pulling amd64 image on aarch64'
+- Related: RHEL-60277
+
 * Wed Nov 27 2024 Jindrich Novy <jnovy@redhat.com> - 2:1.17.0-1
 - update to https://github.com/containers/skopeo/releases/tag/v1.17.0
 - Related: RHEL-60277