Merge pull request #4249 from ggiguash/fix_skopeo_fallback

USHIFT-5083: Always use qualified commit references in bootc kickstart

Author: openshift-merge-bot[bot]

test/bin/scenario.sh

@@ -260,6 +260,15 @@ prepare_kickstart() {
         exit 1
     fi
 
+    # For bootc kickstart templates, make sure that commit references are
+    # fully qualified. Unqualified references are assumed to be served from
+    # the local mirror registry.
+    if [[ "${template}" == *bootc* ]] ; then
+        if [ "$(dirname "${boot_commit_ref}")" == "." ] ; then
+            boot_commit_ref="${MIRROR_REGISTRY_URL}/${boot_commit_ref}"
+        fi
+    fi
+
     mkdir -p "${output_dir}"
     for ifile in "${KICKSTART_TEMPLATE_DIR}/${template}" "${KICKSTART_TEMPLATE_DIR}"/includes/*.cfg ; do
         local output_file

test/kickstart-templates/includes/main-ostreecontainer.cfg

@@ -1,14 +1,12 @@
-# Configure support of pulling images both from a local mirror and remote registries.
-# Note: skopeo falls back to 'docker.io/library' prefix when specifying unqualified
-# image names. These need to be redirected to the local mirror location.
+# Configure support of pulling images both from a local mirror and remote registries
 %pre-install --log=/dev/console --erroronfail
 
 mkdir -p /etc/containers/registries.conf.d
 # Enable insecure registry access from the hypervisor to allow local image pull.
 # See https://github.com/containers/bootc/blob/main/docs/src/registries-and-offline.md#insecure-registries
 cat > /etc/containers/registries.conf.d/998-microshift-bootc-registry.conf <<'EOF'
 [[registry]]
-    prefix = "docker.io/library"
+    prefix = ""
     location = "REPLACE_BOOTC_REGISTRY_URL"
     insecure = true
 EOF