github/skopeo
1
0
Fork 0
mirror of https://github.com/containers/skopeo.git synced 2025-09-01 22:58:24 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2681 from mtrmac/accept-rawhide

Browse Source 
Allow running CI from rawhide images
This commit is contained in:
Miloslav Trmač
2025-08-25 12:57:56 +02:00
committed by GitHub
parent eecc6c8590 2451f10dd8
commit fdcd7c3ebc
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/cirrus/runner.sh
View File

@@ -71,8 +71,10 @@ _run_setup() {
# automation, but the sources are in different directories. It's # automation, but the sources are in different directories. It's
# possible for a mismatch to happen, but should (hopefully) be unlikely. # possible for a mismatch to happen, but should (hopefully) be unlikely.
# Double-check to make sure. # Double-check to make sure.
if ! fgrep -qx "ID=$OS_RELEASE_ID" $mnt/etc/os-release || \ # Temporarily, allow running on Rawhide VMs and consuming older binaries:
! fgrep -qx "VERSION_ID=$OS_RELEASE_VER" $mnt/etc/os-release; then # that should be compatible enough. Eventually, we’ll stop using Rawhide again.
if ! grep -Fqx "ID=$OS_RELEASE_ID" $mnt/etc/os-release || \
{ ! [[ "$VM_IMAGE_NAME" =~ "rawhide" ]] && ! grep -Fqx "VERSION_ID=$OS_RELEASE_VER" $mnt/etc/os-release; } then
die "Somehow $SKOPEO_CIDEV_CONTAINER_FQIN is not based on $OS_REL_VER." die "Somehow $SKOPEO_CIDEV_CONTAINER_FQIN is not based on $OS_REL_VER."
fi fi
msg "Copying test binaries from $SKOPEO_CIDEV_CONTAINER_FQIN /usr/local/bin/" msg "Copying test binaries from $SKOPEO_CIDEV_CONTAINER_FQIN /usr/local/bin/"