Skip to content

fix(release): staged quay promotion via bash oc image mirror #5242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Jun 10, 2026
+491 −13
Merged

fix(release): staged quay promotion via bash oc image mirror #5242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
97 changes: 92 additions & 5 deletions pkg/steps/release/promote.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,8 +338,8 @@ const (
)

// getMirrorRetryShell mirrors images with retries and fails the promotion pod if all attempts fail.
func getMirrorRetryShell(registryConfig string, images []string, loglevel int) string {
mirrorCmd := getMirrorCommand(registryConfig, images, loglevel)
func getMirrorRetryShell(registryConfig string, images []string) string {
mirrorCmd := getMirrorCommand(registryConfig, images, 2)
n := quayPromotionMirrorAttempts
return fmt.Sprintf(`for r in {1..%d}; do
echo Mirror attempt $r
Expand Down Expand Up @@ -381,8 +381,64 @@ done
const (
retryLoopTemplate = "for r in {1..%d}; do echo %s; %s && break; %s; done"
retryLoopWithBackoff = "backoff=$(($RANDOM % 120))s; echo Sleeping randomized $backoff before retry; sleep $backoff"

quayImageIncomingSuffix = "_incoming"
quayImagePreSuffix = "__pre"
quayImagePost1Suffix = "__post1"
)

type quayFloatPromotion struct {
floatTag string
newSrc string
pruneTag string
}

// getStagedQuayFloatPromotionShell returns shell that repoints floatTag from its incoming staging tag.
// If floatTag already exists on the registry, the current image is copied to pruneTag (when set) and
// floatTag+quayImagePreSuffix before the repoint; floatTag+quayImagePost1Suffix is added afterward.
func getStagedQuayFloatPromotionShell(registryConfig, floatTag, pruneTag string) string {
incomingTag := floatTag + quayImageIncomingSuffix
preTag := floatTag + quayImagePreSuffix
post1Tag := floatTag + quayImagePost1Suffix

checkOld := fmt.Sprintf(`_OLD_EXISTS=false
if oc image info --registry-config=%s %s >/dev/null 2>&1; then _OLD_EXISTS=true; fi`, registryConfig, floatTag)

var backupOld string
if pruneTag != "" {
backupOld = fmt.Sprintf(`if [ "${_OLD_EXISTS}" = "true" ]; then
%s
%s
fi`,
indentShell(getMirrorRetryShell(registryConfig, []string{fmt.Sprintf("%s=%s", floatTag, pruneTag)})),
indentShell(getMirrorRetryShell(registryConfig, []string{fmt.Sprintf("%s=%s", floatTag, preTag)})),
)
} else {
backupOld = fmt.Sprintf(`if [ "${_OLD_EXISTS}" = "true" ]; then
%s
fi`, indentShell(getMirrorRetryShell(registryConfig, []string{fmt.Sprintf("%s=%s", floatTag, preTag)})))
}

latch := getMirrorRetryShell(registryConfig, []string{fmt.Sprintf("%s=%s", incomingTag, floatTag)})

postLatch := fmt.Sprintf(`if [ "${_OLD_EXISTS}" = "true" ]; then
%s
fi`, indentShell(getMirrorRetryShell(registryConfig, []string{fmt.Sprintf("%s=%s", floatTag, post1Tag)})))

return strings.Join([]string{checkOld, backupOld, latch, postLatch}, "\n")
}

func indentShell(script string) string {
const prefix = " "
lines := strings.Split(script, "\n")
for i, line := range lines {
if line != "" {
lines[i] = prefix + line
}
}
return strings.Join(lines, "\n")
}

func getPromotionPod(imageMirrorTarget map[string]string, timeStr string, namespace string, name string, cliImage string, nodeArchitectures []string) *coreapi.Pod {
keys := make([]string, 0, len(imageMirrorTarget))
for k := range imageMirrorTarget {
Expand All @@ -391,7 +447,10 @@ func getPromotionPod(imageMirrorTarget map[string]string, timeStr string, namesp
sort.Strings(keys)

var images []string
var incomingImages []string
var pruneImages []string
var quayFloatPromotions []quayFloatPromotion
pruneTagForFloat := map[string]string{}
var tags []string
// resolveAndTagPairs holds [quayProxyTag, isTag] for official ocp IS targets (consolidated
// ocp/4.x:tag and legacy *-quay). Resolved post-mirror via oc image info + oc tag.
Expand All @@ -401,12 +460,25 @@ func getPromotionPod(imageMirrorTarget map[string]string, timeStr string, namesp

for _, k := range keys {
if strings.Contains(k, fmt.Sprintf("%s_prune_", timeStr)) {
pruneImages = append(pruneImages, fmt.Sprintf("%s=%s", imageMirrorTarget[k], k))
floatTag := imageMirrorTarget[k]
if isQuayStep {
pruneTagForFloat[floatTag] = k
} else {
pruneImages = append(pruneImages, fmt.Sprintf("%s=%s", floatTag, k))
}
} else {
src := imageMirrorTarget[k]
if strings.HasPrefix(k, api.QuayOpenShiftCIRepo+":") {
// Images promoted into quay.io/openshift/ci always use oc image mirror (tag or digest sources).
images = append(images, fmt.Sprintf("%s=%s", src, k))
if isQuayStep {
incomingImages = append(incomingImages, fmt.Sprintf("%s=%s", src, k+quayImageIncomingSuffix))
quayFloatPromotions = append(quayFloatPromotions, quayFloatPromotion{
floatTag: k,
newSrc: src,
})
} else {
images = append(images, fmt.Sprintf("%s=%s", src, k))
}
} else if isQuayStep && !strings.Contains(k, api.ComponentFormatReplacement) {
// Concrete quay IS target: resolve the QCI digest after mirroring instead of
// using a pre-computed (potentially tag-only) source so spec.from is always digest-based.
Expand All @@ -429,14 +501,18 @@ func getPromotionPod(imageMirrorTarget map[string]string, timeStr string, namesp
}
}

for i := range quayFloatPromotions {
quayFloatPromotions[i].pruneTag = pruneTagForFloat[quayFloatPromotions[i].floatTag]
}

registryConfig := filepath.Join(api.RegistryPushCredentialsCICentralSecretMountPath, coreapi.DockerConfigJsonKey)
command := []string{"/bin/sh", "-c"}

var commands []string

// Generate mirror commands if there are images to mirror
if len(images) > 0 {
commands = append(commands, getMirrorRetryShell(registryConfig, images, 2))
commands = append(commands, getMirrorRetryShell(registryConfig, images))
}

if isQuayStep {
Expand Down Expand Up @@ -466,6 +542,17 @@ func getPromotionPod(imageMirrorTarget map[string]string, timeStr string, namesp
}

var args []string
if isQuayStep && len(incomingImages) > 0 {
args = append(args, getMirrorRetryShell(registryConfig, incomingImages))
}
if isQuayStep && len(quayFloatPromotions) > 0 {
sort.Slice(quayFloatPromotions, func(i, j int) bool {
return quayFloatPromotions[i].floatTag < quayFloatPromotions[j].floatTag
})
for _, promotion := range quayFloatPromotions {
args = append(args, getStagedQuayFloatPromotionShell(registryConfig, promotion.floatTag, promotion.pruneTag))
}
}
if len(pruneImages) > 0 {
// See https://github.com/openshift/release/blob/2080ec4a49337c27577a4b2ff08a538e96436e65/hack/qci_registry_pruner.py for details.
// Note that we don't retry here and we ignore failures because (a) it may be the first time an image tag is
Expand Down
2 changes: 1 addition & 1 deletion pkg/steps/release/promote_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1112,7 +1112,7 @@ func TestGetPublicImageReference(t *testing.T) {

func TestGetMirrorRetryShell(t *testing.T) {
regcfg := "/etc/push-secret/.dockerconfigjson"
got := getMirrorRetryShell(regcfg, []string{"src=dst"}, 2)
got := getMirrorRetryShell(regcfg, []string{"src=dst"})
for _, sub := range []string{
"for r in {1..5}",
"Mirror attempt $r",
Expand Down
95 changes: 93 additions & 2 deletions pkg/steps/release/testdata/zz_fixture_TestGetPromotionPod_promotion_quay.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,108 @@ spec:
containers:
- args:
- |-
oc image mirror --loglevel=2 --keep-manifest-list --registry-config=/etc/push-secret/.dockerconfigjson --max-per-registry=10 quay.io/openshift/ci:ci_a_latest=quay.io/openshift/ci:20240603235401_prune_ci_a_latest quay.io/openshift/ci:ci_c_latest=quay.io/openshift/ci:20240603235401_prune_ci_c_latest || true
for r in {1..5}; do
echo Mirror attempt $r
if oc image mirror --loglevel=2 --keep-manifest-list --registry-config=/etc/push-secret/.dockerconfigjson --max-per-registry=10 registry.build02.ci.openshift.org/ci-op-y2n8rsh3/pipeline@sha256:bbb=quay.io/openshift/ci:ci_a_latest registry.build02.ci.openshift.org/ci-op-y2n8rsh3/pipeline@sha256:ddd=quay.io/openshift/ci:ci_c_latest; then break; fi
if oc image mirror --loglevel=2 --keep-manifest-list --registry-config=/etc/push-secret/.dockerconfigjson --max-per-registry=10 registry.build02.ci.openshift.org/ci-op-y2n8rsh3/pipeline@sha256:bbb=quay.io/openshift/ci:ci_a_latest_incoming registry.build02.ci.openshift.org/ci-op-y2n8rsh3/pipeline@sha256:ddd=quay.io/openshift/ci:ci_c_latest_incoming; then break; fi
if [ "${r}" -eq 5 ]; then
exit 1
fi
backoff=$(($RANDOM % 120))s
echo Sleeping randomized $backoff before retry
sleep $backoff
done
_OLD_EXISTS=false
if oc image info --registry-config=/etc/push-secret/.dockerconfigjson quay.io/openshift/ci:ci_a_latest >/dev/null 2>&1; then _OLD_EXISTS=true; fi
if [ "${_OLD_EXISTS}" = "true" ]; then
for r in {1..5}; do
echo Mirror attempt $r
if oc image mirror --loglevel=2 --keep-manifest-list --registry-config=/etc/push-secret/.dockerconfigjson --max-per-registry=10 quay.io/openshift/ci:ci_a_latest=quay.io/openshift/ci:20240603235401_prune_ci_a_latest; then break; fi
if [ "${r}" -eq 5 ]; then
exit 1
fi
backoff=$(($RANDOM % 120))s
echo Sleeping randomized $backoff before retry
sleep $backoff
done
for r in {1..5}; do
echo Mirror attempt $r
if oc image mirror --loglevel=2 --keep-manifest-list --registry-config=/etc/push-secret/.dockerconfigjson --max-per-registry=10 quay.io/openshift/ci:ci_a_latest=quay.io/openshift/ci:ci_a_latest__pre; then break; fi
if [ "${r}" -eq 5 ]; then
exit 1
fi
backoff=$(($RANDOM % 120))s
echo Sleeping randomized $backoff before retry
sleep $backoff
done
fi
for r in {1..5}; do
echo Mirror attempt $r
if oc image mirror --loglevel=2 --keep-manifest-list --registry-config=/etc/push-secret/.dockerconfigjson --max-per-registry=10 quay.io/openshift/ci:ci_a_latest_incoming=quay.io/openshift/ci:ci_a_latest; then break; fi
if [ "${r}" -eq 5 ]; then
exit 1
fi
backoff=$(($RANDOM % 120))s
echo Sleeping randomized $backoff before retry
sleep $backoff
done
if [ "${_OLD_EXISTS}" = "true" ]; then
for r in {1..5}; do
echo Mirror attempt $r
if oc image mirror --loglevel=2 --keep-manifest-list --registry-config=/etc/push-secret/.dockerconfigjson --max-per-registry=10 quay.io/openshift/ci:ci_a_latest=quay.io/openshift/ci:ci_a_latest__post1; then break; fi
if [ "${r}" -eq 5 ]; then
exit 1
fi
backoff=$(($RANDOM % 120))s
echo Sleeping randomized $backoff before retry
sleep $backoff
done
fi
_OLD_EXISTS=false
if oc image info --registry-config=/etc/push-secret/.dockerconfigjson quay.io/openshift/ci:ci_c_latest >/dev/null 2>&1; then _OLD_EXISTS=true; fi
if [ "${_OLD_EXISTS}" = "true" ]; then
for r in {1..5}; do
echo Mirror attempt $r
if oc image mirror --loglevel=2 --keep-manifest-list --registry-config=/etc/push-secret/.dockerconfigjson --max-per-registry=10 quay.io/openshift/ci:ci_c_latest=quay.io/openshift/ci:20240603235401_prune_ci_c_latest; then break; fi
if [ "${r}" -eq 5 ]; then
exit 1
fi
backoff=$(($RANDOM % 120))s
echo Sleeping randomized $backoff before retry
sleep $backoff
done
for r in {1..5}; do
echo Mirror attempt $r
if oc image mirror --loglevel=2 --keep-manifest-list --registry-config=/etc/push-secret/.dockerconfigjson --max-per-registry=10 quay.io/openshift/ci:ci_c_latest=quay.io/openshift/ci:ci_c_latest__pre; then break; fi
if [ "${r}" -eq 5 ]; then
exit 1
fi
backoff=$(($RANDOM % 120))s
echo Sleeping randomized $backoff before retry
sleep $backoff
done
fi
for r in {1..5}; do
echo Mirror attempt $r
if oc image mirror --loglevel=2 --keep-manifest-list --registry-config=/etc/push-secret/.dockerconfigjson --max-per-registry=10 quay.io/openshift/ci:ci_c_latest_incoming=quay.io/openshift/ci:ci_c_latest; then break; fi
if [ "${r}" -eq 5 ]; then
exit 1
fi
backoff=$(($RANDOM % 120))s
echo Sleeping randomized $backoff before retry
sleep $backoff
done
if [ "${_OLD_EXISTS}" = "true" ]; then
for r in {1..5}; do
echo Mirror attempt $r
if oc image mirror --loglevel=2 --keep-manifest-list --registry-config=/etc/push-secret/.dockerconfigjson --max-per-registry=10 quay.io/openshift/ci:ci_c_latest=quay.io/openshift/ci:ci_c_latest__post1; then break; fi
if [ "${r}" -eq 5 ]; then
exit 1
fi
backoff=$(($RANDOM % 120))s
echo Sleeping randomized $backoff before retry
sleep $backoff
done
fi
set +e
for r in {1..2}; do echo "Tag attempt $r (all together)"; oc tag --source=docker --loglevel=2 --reference-policy='source' --import-mode='PreserveOriginal' --reference quay-proxy.ci.openshift.org/openshift/ci@sha256:ddd ci/${component}-quay:c quay-proxy.ci.openshift.org/openshift/ci@sha256:bbb ci/ci-quay:${component} && break; :; done
for r in {1..3}; do echo "Tag attempt $r (individual)"; oc tag --source=docker --loglevel=2 --reference-policy='source' --import-mode='PreserveOriginal' --reference quay-proxy.ci.openshift.org/openshift/ci@sha256:ddd ci/${component}-quay:c && break; backoff=$(($RANDOM % 120))s; echo Sleeping randomized $backoff before retry; sleep $backoff; done
Expand Down
95 changes: 93 additions & 2 deletions pkg/steps/release/testdata/zz_fixture_TestGetPromotionPod_promotion_quay_4.12.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,108 @@ spec:
containers:
- args:
- |
oc image mirror --loglevel=2 --keep-manifest-list --registry-config=/etc/push-secret/.dockerconfigjson --max-per-registry=10 quay.io/openshift/ci:ocp_4.12_ovn-kubernetes=quay.io/openshift/ci:20240603235401_prune_ovn-kubernetes quay.io/openshift/ci:ocp_4.12_ovn-kubernetes-base=quay.io/openshift/ci:20240603235401_prune_ovn-kubernetes-base || true
for r in {1..5}; do
echo Mirror attempt $r
if oc image mirror --loglevel=2 --keep-manifest-list --registry-config=/etc/push-secret/.dockerconfigjson --max-per-registry=10 registry.build02.ci.openshift.org/ci-op-y2n8rsh3/pipeline@sha256:aaa=quay.io/openshift/ci:ocp_4.12_ovn-kubernetes registry.build02.ci.openshift.org/ci-op-y2n8rsh3/pipeline@sha256:bbb=quay.io/openshift/ci:ocp_4.12_ovn-kubernetes-base; then break; fi
if oc image mirror --loglevel=2 --keep-manifest-list --registry-config=/etc/push-secret/.dockerconfigjson --max-per-registry=10 registry.build02.ci.openshift.org/ci-op-y2n8rsh3/pipeline@sha256:aaa=quay.io/openshift/ci:ocp_4.12_ovn-kubernetes_incoming registry.build02.ci.openshift.org/ci-op-y2n8rsh3/pipeline@sha256:bbb=quay.io/openshift/ci:ocp_4.12_ovn-kubernetes-base_incoming; then break; fi
if [ "${r}" -eq 5 ]; then
exit 1
fi
backoff=$(($RANDOM % 120))s
echo Sleeping randomized $backoff before retry
sleep $backoff
done
_OLD_EXISTS=false
if oc image info --registry-config=/etc/push-secret/.dockerconfigjson quay.io/openshift/ci:ocp_4.12_ovn-kubernetes >/dev/null 2>&1; then _OLD_EXISTS=true; fi
if [ "${_OLD_EXISTS}" = "true" ]; then
for r in {1..5}; do
echo Mirror attempt $r
if oc image mirror --loglevel=2 --keep-manifest-list --registry-config=/etc/push-secret/.dockerconfigjson --max-per-registry=10 quay.io/openshift/ci:ocp_4.12_ovn-kubernetes=quay.io/openshift/ci:20240603235401_prune_ovn-kubernetes; then break; fi
if [ "${r}" -eq 5 ]; then
exit 1
fi
backoff=$(($RANDOM % 120))s
echo Sleeping randomized $backoff before retry
sleep $backoff
done
for r in {1..5}; do
echo Mirror attempt $r
if oc image mirror --loglevel=2 --keep-manifest-list --registry-config=/etc/push-secret/.dockerconfigjson --max-per-registry=10 quay.io/openshift/ci:ocp_4.12_ovn-kubernetes=quay.io/openshift/ci:ocp_4.12_ovn-kubernetes__pre; then break; fi
if [ "${r}" -eq 5 ]; then
exit 1
fi
backoff=$(($RANDOM % 120))s
echo Sleeping randomized $backoff before retry
sleep $backoff
done
fi
for r in {1..5}; do
echo Mirror attempt $r
if oc image mirror --loglevel=2 --keep-manifest-list --registry-config=/etc/push-secret/.dockerconfigjson --max-per-registry=10 quay.io/openshift/ci:ocp_4.12_ovn-kubernetes_incoming=quay.io/openshift/ci:ocp_4.12_ovn-kubernetes; then break; fi
if [ "${r}" -eq 5 ]; then
exit 1
fi
backoff=$(($RANDOM % 120))s
echo Sleeping randomized $backoff before retry
sleep $backoff
done
if [ "${_OLD_EXISTS}" = "true" ]; then
for r in {1..5}; do
echo Mirror attempt $r
if oc image mirror --loglevel=2 --keep-manifest-list --registry-config=/etc/push-secret/.dockerconfigjson --max-per-registry=10 quay.io/openshift/ci:ocp_4.12_ovn-kubernetes=quay.io/openshift/ci:ocp_4.12_ovn-kubernetes__post1; then break; fi
if [ "${r}" -eq 5 ]; then
exit 1
fi
backoff=$(($RANDOM % 120))s
echo Sleeping randomized $backoff before retry
sleep $backoff
done
fi
_OLD_EXISTS=false
if oc image info --registry-config=/etc/push-secret/.dockerconfigjson quay.io/openshift/ci:ocp_4.12_ovn-kubernetes-base >/dev/null 2>&1; then _OLD_EXISTS=true; fi
if [ "${_OLD_EXISTS}" = "true" ]; then
for r in {1..5}; do
echo Mirror attempt $r
if oc image mirror --loglevel=2 --keep-manifest-list --registry-config=/etc/push-secret/.dockerconfigjson --max-per-registry=10 quay.io/openshift/ci:ocp_4.12_ovn-kubernetes-base=quay.io/openshift/ci:20240603235401_prune_ovn-kubernetes-base; then break; fi
if [ "${r}" -eq 5 ]; then
exit 1
fi
backoff=$(($RANDOM % 120))s
echo Sleeping randomized $backoff before retry
sleep $backoff
done
for r in {1..5}; do
echo Mirror attempt $r
if oc image mirror --loglevel=2 --keep-manifest-list --registry-config=/etc/push-secret/.dockerconfigjson --max-per-registry=10 quay.io/openshift/ci:ocp_4.12_ovn-kubernetes-base=quay.io/openshift/ci:ocp_4.12_ovn-kubernetes-base__pre; then break; fi
if [ "${r}" -eq 5 ]; then
exit 1
fi
backoff=$(($RANDOM % 120))s
echo Sleeping randomized $backoff before retry
sleep $backoff
done
fi
for r in {1..5}; do
echo Mirror attempt $r
if oc image mirror --loglevel=2 --keep-manifest-list --registry-config=/etc/push-secret/.dockerconfigjson --max-per-registry=10 quay.io/openshift/ci:ocp_4.12_ovn-kubernetes-base_incoming=quay.io/openshift/ci:ocp_4.12_ovn-kubernetes-base; then break; fi
if [ "${r}" -eq 5 ]; then
exit 1
fi
backoff=$(($RANDOM % 120))s
echo Sleeping randomized $backoff before retry
sleep $backoff
done
if [ "${_OLD_EXISTS}" = "true" ]; then
for r in {1..5}; do
echo Mirror attempt $r
if oc image mirror --loglevel=2 --keep-manifest-list --registry-config=/etc/push-secret/.dockerconfigjson --max-per-registry=10 quay.io/openshift/ci:ocp_4.12_ovn-kubernetes-base=quay.io/openshift/ci:ocp_4.12_ovn-kubernetes-base__post1; then break; fi
if [ "${r}" -eq 5 ]; then
exit 1
fi
backoff=$(($RANDOM % 120))s
echo Sleeping randomized $backoff before retry
sleep $backoff
done
fi
for r in {1..5}; do
_digest=$(oc image info --registry-config=/etc/push-secret/.dockerconfigjson --filter-by-os=linux/amd64 quay.io/openshift/ci:ocp_4.12_ovn-kubernetes | sed -n '/^Digest:[[:space:]]/s/^Digest:[[:space:]]*//p' | head -n1)
if [ -n "${_digest}" ] && oc tag --source=docker --loglevel=2 --reference-policy='source' --import-mode='PreserveOriginal' --reference quay-proxy.ci.openshift.org/openshift/ci@${_digest} ocp/4.12:ovn-kubernetes; then
Expand Down
Loading