ci: set skopeo CI branch and test fixes

We need to test against the right skopeo branch so we can even build
this, and then the new skopeo image needs a new test fix.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>

Author: Luap99

hack/ci/runner.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-SKOPEO_CI_BRANCH=main
+SKOPEO_CI_BRANCH=release-1.22
 
 # This script is only intended to be run inside the Lima VM to configure it and start the tests.
 # Do not run locally.
@@ -156,8 +156,14 @@ run_image_skopeo() {
     sudo podman umount --latest
     sudo podman rm --latest
 
-    git clone -b "$SKOPEO_CI_BRANCH" https://github.com/containers/skopeo.git "$SKOPEO_PATH"
+    git clone -b "$SKOPEO_CI_BRANCH" https://github.com/podman-container-tools/skopeo.git "$SKOPEO_PATH"
     cd "$SKOPEO_PATH"
+
+    # HACK: patch skopeo with a later test fix
+    git config --global user.email "container-libs@podman.io"
+    git config --global user.name "container-libs ci"
+    curl --fail https://github.com/podman-container-tools/skopeo/commit/726479d948b471ad445a6aeff183b38b806bbc87.patch | git am -
+
     go mod edit -replace "go.podman.io/storage=$GOSRC/storage"
     go mod edit -replace "go.podman.io/image/v5=$GOSRC/image"
     go mod edit -replace "go.podman.io/common=$GOSRC/common"