rpms/skopeo
5
0
Fork 0
Code Issues Pull Requests Releases Activity

skopeo-1.17.0-3.el10

Browse Source 
- fix 'Skopeo system tests pulling amd64 image on aarch64'
- Resolves: RHEL-76027

Signed-off-by: Jindrich Novy <jnovy@redhat.com>
This commit is contained in:
Jindrich Novy 2025-01-23 13:28:27 +01:00
parent c61fcb3230
commit c84ee82a2a
2 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
2493.patch Normal file
View File

@ -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

7
skopeo.spec
View File

@ -46,7 +46,7 @@ Epoch: %{conditional_epoch}
Version: 1.17.0
# The `AND` needs to be uppercase in the License for SPDX compatibility
License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0
Release: 2%{?dist}
Release: 3%{?dist}
%if %{defined golang_arches_future}
ExclusiveArch: %{golang_arches_future}
%else
@ -56,6 +56,7 @@ Summary: Inspect container images and repositories on registries
URL: https://github.com/containers/%{name}
# Tarball fetched from upstream
Source0: %{url}/archive/v%{version}.tar.gz
Patch0: https://patch-diff.githubusercontent.com/raw/containers/skopeo/pull/2493.patch
BuildRequires: %{_bindir}/go-md2man
%if %{defined build_with_btrfs}
BuildRequires: btrfs-progs-devel
@ -166,6 +167,10 @@ cp -pav systemtest/* %{buildroot}/%{_datadir}/%{name}/test/system/
%{_datadir}/%{name}/test
%changelog
* Thu Jan 23 2025 Jindrich Novy <jnovy@redhat.com> - 1:1.17.0-3
- fix 'Skopeo system tests pulling amd64 image on aarch64'
- Resolves: RHEL-76027
* Tue Dec 10 2024 Jindrich Novy <jnovy@redhat.com> - 1:1.17.0-2
- remove squashfs-tools from RHEL10 build
- Related: RHEL-68938