From a19a90bcbfc997ed4547b07ad19b2826fae13457 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 22 Dec 2025 04:10:36 +0000 Subject: [PATCH 1/4] update last_rebase.sh --- scripts/auto-rebase/last_rebase.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index d9d23f5f7d..75ed5703b9 100755 --- a/scripts/auto-rebase/last_rebase.sh +++ b/scripts/auto-rebase/last_rebase.sh @@ -1,2 +1,2 @@ #!/bin/bash -x -./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.17.0-0.nightly-2025-12-17-200925" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2025-12-18-031630" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.17.0-0.nightly-2025-12-21-112352" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2025-12-22-031630" From 34ae6209283378e77c470adaf7c7389fa9278165 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 22 Dec 2025 04:10:36 +0000 Subject: [PATCH 2/4] update changelog --- scripts/auto-rebase/changelog.txt | 7 ++----- scripts/auto-rebase/commits.txt | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index aeb9940982..c6524c9b92 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,6 +1,3 @@ -- ovn-kubernetes image-amd64 187ee3d355dc5e2b5ed8e2cfbd2d3342e66c14be to 5190b4a6433b4a18f29ba1a5df541ba95e225e04 - - 6b0f4700 2025-12-09T08:52:15-08:00 Add ricky-rav to OWNERS for release-4.17 - -- ovn-kubernetes image-arm64 187ee3d355dc5e2b5ed8e2cfbd2d3342e66c14be to 5190b4a6433b4a18f29ba1a5df541ba95e225e04 - - 6b0f4700 2025-12-09T08:52:15-08:00 Add ricky-rav to OWNERS for release-4.17 +- operator-framework-olm embedded-component 12fbe1b70635c5c100a6a5fc5734280a17a95c3d to 52652d0744d7cf955defb84d38f45bfe640d7850 + - 3b968a15 2025-12-12T14:17:47+01:00 Fix TOCTOU race condition in ensureInstallPlan (#3682) diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 720b8b6a49..6382e89b09 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -14,7 +14,7 @@ https://github.com/openshift/kubernetes embedded-component ef8f548afe29ceeb65b38 https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 69b07ae04918806079f1a4fbc2f110453bc8db19 https://github.com/openshift/machine-config-operator embedded-component 0ba59a8ecaa09254bd2c14bd565a3cb597cdcda1 https://github.com/openshift/openshift-controller-manager embedded-component 967faa66125ae77148df87d8394d07112c4c0b8c -https://github.com/openshift/operator-framework-olm embedded-component 12fbe1b70635c5c100a6a5fc5734280a17a95c3d +https://github.com/openshift/operator-framework-olm embedded-component 52652d0744d7cf955defb84d38f45bfe640d7850 https://github.com/openshift/route-controller-manager embedded-component 02bbf80ada3d5acaf36873b1fe69c71badc6d8d7 https://github.com/openshift/service-ca-operator embedded-component 6ce6cceb6618a193b7a61b9bfbc7f559187dbb9e https://github.com/openshift/oc image-amd64 d76df14ea3d7ff9916ea576b6335cd3a220cd1bf From ead0bbbee715a22a118b6fbf102588668d912a28 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 22 Dec 2025 04:11:10 +0000 Subject: [PATCH 3/4] update manifests --- assets/optional/multus/release-multus-aarch64.json | 2 +- assets/optional/multus/release-multus-x86_64.json | 2 +- .../operator-lifecycle-manager/kustomization.x86_64.yaml | 8 ++++---- .../operator-lifecycle-manager/release-olm-aarch64.json | 2 +- .../operator-lifecycle-manager/release-olm-x86_64.json | 6 +++--- assets/release/release-aarch64.json | 4 ++-- assets/release/release-x86_64.json | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/assets/optional/multus/release-multus-aarch64.json b/assets/optional/multus/release-multus-aarch64.json index 66d58ae0c7..74de328e79 100644 --- a/assets/optional/multus/release-multus-aarch64.json +++ b/assets/optional/multus/release-multus-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.17.0-0.nightly-arm64-2025-12-18-031630" + "base": "4.17.0-0.nightly-arm64-2025-12-22-031630" }, "images": { "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bcfcf00edd066998cfdec302180b7086e3646ede28fb087ced1e8cc14381a33f", diff --git a/assets/optional/multus/release-multus-x86_64.json b/assets/optional/multus/release-multus-x86_64.json index cf996f4657..4477013153 100644 --- a/assets/optional/multus/release-multus-x86_64.json +++ b/assets/optional/multus/release-multus-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.17.0-0.nightly-2025-12-17-200925" + "base": "4.17.0-0.nightly-2025-12-21-112352" }, "images": { "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:eae19aef5814e643d574a49a5728564d602acac8df13ad0d7a7812504a1a62ce", diff --git a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml index 55f9440d9e..597ace6971 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml @@ -2,10 +2,10 @@ images: - name: quay.io/operator-framework/olm newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:ec13bafa41e7dd10c7aa0af822b66ecb9f36d48676ab007806d705f7cec6d226 + digest: sha256:886bf376cce02112c97f9751b74412ac0f486bce31de44aaf196353fe68420b1 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:542effea42c018c52c3716191d6288de9eeee82ace7ca1c9a18aff4962605fad + digest: sha256:fcfa5ad41417042f2e7341a307f8eb047633235724422d88766772893a5c0689 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev digest: sha256:55210522249f3897886d414cb7d2ac8c6c2aa0dfa10859804f623ffdde51a43a @@ -16,12 +16,12 @@ patches: path: /spec/template/spec/containers/0/env/- value: name: OPERATOR_REGISTRY_IMAGE - value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:542effea42c018c52c3716191d6288de9eeee82ace7ca1c9a18aff4962605fad + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fcfa5ad41417042f2e7341a307f8eb047633235724422d88766772893a5c0689 - op: add path: /spec/template/spec/containers/0/env/- value: name: OLM_IMAGE - value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ec13bafa41e7dd10c7aa0af822b66ecb9f36d48676ab007806d705f7cec6d226 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:886bf376cce02112c97f9751b74412ac0f486bce31de44aaf196353fe68420b1 target: kind: Deployment labelSelector: app=catalog-operator diff --git a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json index cf29643c75..ee1499160f 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.17.0-0.nightly-arm64-2025-12-18-031630" + "base": "4.17.0-0.nightly-arm64-2025-12-22-031630" }, "images": { "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:eae56bb2c2b111f616f21a8c333ac075747f463d4ee751956339dcd7fa445f2e", diff --git a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json index 86dfba7837..604956d726 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json @@ -1,10 +1,10 @@ { "release": { - "base": "4.17.0-0.nightly-2025-12-17-200925" + "base": "4.17.0-0.nightly-2025-12-21-112352" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ec13bafa41e7dd10c7aa0af822b66ecb9f36d48676ab007806d705f7cec6d226", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:542effea42c018c52c3716191d6288de9eeee82ace7ca1c9a18aff4962605fad", + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:886bf376cce02112c97f9751b74412ac0f486bce31de44aaf196353fe68420b1", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fcfa5ad41417042f2e7341a307f8eb047633235724422d88766772893a5c0689", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:55210522249f3897886d414cb7d2ac8c6c2aa0dfa10859804f623ffdde51a43a" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index a16ccd417a..95d4e53797 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,13 +1,13 @@ { "release": { - "base": "4.17.0-0.nightly-arm64-2025-12-18-031630" + "base": "4.17.0-0.nightly-arm64-2025-12-22-031630" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9969545c69b7d3e183723afe310cd27f5e908e313d389aae4adebbb465c20bfc", "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2b65e91089af4c64c12f6edddd0f847de1461fc342f06b69540a469663cda9fa", "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fc90a1fc6a1c99337c6d402e5d91e797e07038be30281b9c11bb91d0a601ffa7", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:db9220754b91539fe34175553294909f93c9f28112937ecdbb4c1a46e5edff3b", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:31a8400d01a605529c736d117dd3a0120dc35e4ed328143d68048ccf203d37d3", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2ebbba06ee573efbd81f4ea6af62ef3e56ef3c4bc0fbfca2c0f334d99601bc46", "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:166d3f1417bd28c66b845b1e330e0b5e6c215a7c66a17bb1ce2368672a98ea97", "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1e88f9486f62aacb93248eccc490a9c3e7a44951ec44a11c4b04c6562424b02e", "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:bd6dc4d6e90fdbcdb844759e203c9c591abc5ac29a956257a90bda101a37b76e", diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 6e2865ae0a..d4e2132b15 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,13 +1,13 @@ { "release": { - "base": "4.17.0-0.nightly-2025-12-17-200925" + "base": "4.17.0-0.nightly-2025-12-21-112352" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2199b6d6017c4115fee60778d05cb51a6288604685eb302c375bf12f9178d980", "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:71e9f72633766fbcf4bea97a2fc6b300eeec7a801b8f034aad5455be1dc6967a", "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6356ec69cacde72f441ee40963dcdc5db9b0a32f2d50ccfb60b1425eada51660", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:55210522249f3897886d414cb7d2ac8c6c2aa0dfa10859804f623ffdde51a43a", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:36201b2dd2aaf0a1d47f73282f6cf8e319f87c54536e3059384163883cd1ad36", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3c75b76be5f88fd36e9250d5526004dafd5de41f69e7e96b8693046d1e93081c", "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b1bd67debc179b86916bfa99e43432e93dd079fa441cb1d5d01516ba82ea636c", "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2122e834cca9a53a21bd55e47c01905509ffbeb57d8d89d941e95323e202feb5", "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:bd6dc4d6e90fdbcdb844759e203c9c591abc5ac29a956257a90bda101a37b76e", From 1ea05ad9dcbf2e77f3abb735d3c7052ec74d758d Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 22 Dec 2025 04:11:11 +0000 Subject: [PATCH 4/4] update buildfiles --- Makefile.version.aarch64.var | 2 +- Makefile.version.x86_64.var | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index 175c0f009e..6dd19f6655 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.17.0-0.nightly-arm64-2025-12-18-031630 +OCP_VERSION := 4.17.0-0.nightly-arm64-2025-12-22-031630 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index f778489f8f..1c24ef8034 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.17.0-0.nightly-2025-12-17-200925 +OCP_VERSION := 4.17.0-0.nightly-2025-12-21-112352