From 15a4afb3ffa308e8ba660afcc5cf4a3b1075e23f Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 21 May 2026 04:18:52 +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 e89af98a4c..a28c71b72d 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-2026-05-14-020539" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2026-05-17-192124" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.17.0-0.nightly-2026-05-20-004318" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2026-05-20-034303" From 6efe9df995e1fa9fe8e8fc4e1ec0ed09a92dcbcd Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 21 May 2026 04:19:25 +0000 Subject: [PATCH 2/4] update component images --- packaging/crio.conf.d/10-microshift_amd64.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/crio.conf.d/10-microshift_amd64.conf b/packaging/crio.conf.d/10-microshift_amd64.conf index 2ae7a19590..311a776bfc 100644 --- a/packaging/crio.conf.d/10-microshift_amd64.conf +++ b/packaging/crio.conf.d/10-microshift_amd64.conf @@ -25,6 +25,6 @@ plugin_dirs = [ # for community builds on top of OKD, this setting has no effect [crio.image] global_auth_file="/etc/crio/openshift-pull-secret" -pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b0d50636515e3f2c7ecdd7f06feaeb3cf62bb44ffdee2b65f2ad31a52d5f9a71" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8dd1eb1314ebc6457ebc60ab1eee9f3c56bf4152d0ce28b8eea314e9889a3f43" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" From 22bae182d0e39f9f62d45f88e987d50fbbe904aa Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 21 May 2026 04:19:27 +0000 Subject: [PATCH 3/4] update manifests --- .../optional/multus/kustomization.x86_64.yaml | 4 ++-- .../multus/release-multus-aarch64.json | 2 +- .../multus/release-multus-x86_64.json | 6 +++--- .../kustomization.x86_64.yaml | 10 +++++----- .../release-olm-aarch64.json | 2 +- .../release-olm-x86_64.json | 8 ++++---- assets/release/release-aarch64.json | 2 +- assets/release/release-x86_64.json | 20 +++++++++---------- 8 files changed, 27 insertions(+), 27 deletions(-) diff --git a/assets/optional/multus/kustomization.x86_64.yaml b/assets/optional/multus/kustomization.x86_64.yaml index 54fcfeeaaa..ccd123fb8d 100644 --- a/assets/optional/multus/kustomization.x86_64.yaml +++ b/assets/optional/multus/kustomization.x86_64.yaml @@ -2,7 +2,7 @@ images: - name: multus-cni-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:95d4ce6042c8c5cf9d2cd831b09a86cc8ef2dcd20964dfe78705bdc926704cf0 + digest: sha256:c2fe19080c5a2eea1093d2bda90c0beb9fe33d0558d6c1ec42e69e7e07deaac2 - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:1bbf209c6a30147eedee7e2874814e35419fe734d8485f1a299c2ee4d6d27154 + digest: sha256:fd370a7522d2a91b6f24c388e67da47b8110c24d23c8cbcdffbae46f6b90b978 diff --git a/assets/optional/multus/release-multus-aarch64.json b/assets/optional/multus/release-multus-aarch64.json index d65538b311..46fd908114 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-2026-05-17-192124" + "base": "4.17.0-0.nightly-arm64-2026-05-20-034303" }, "images": { "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:073a50a33cc8c18677de98bbc7a32a80588e2a96c9f8a99d5de0fc7dd628a8b2", diff --git a/assets/optional/multus/release-multus-x86_64.json b/assets/optional/multus/release-multus-x86_64.json index e578194311..e0be93bfa3 100644 --- a/assets/optional/multus/release-multus-x86_64.json +++ b/assets/optional/multus/release-multus-x86_64.json @@ -1,9 +1,9 @@ { "release": { - "base": "4.17.0-0.nightly-2026-05-14-020539" + "base": "4.17.0-0.nightly-2026-05-20-004318" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:95d4ce6042c8c5cf9d2cd831b09a86cc8ef2dcd20964dfe78705bdc926704cf0", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1bbf209c6a30147eedee7e2874814e35419fe734d8485f1a299c2ee4d6d27154" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c2fe19080c5a2eea1093d2bda90c0beb9fe33d0558d6c1ec42e69e7e07deaac2", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fd370a7522d2a91b6f24c388e67da47b8110c24d23c8cbcdffbae46f6b90b978" } } diff --git a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml index f8cc3855e9..d4245aaeb7 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml @@ -2,13 +2,13 @@ images: - name: quay.io/operator-framework/olm newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:07b661c9716cbd968702e3574c5d0ba31cabf49257f75210b118f96858e06662 + digest: sha256:7ed78ccfb7f7bc989643ed325ad23e865bd2181eee0db5a89aabab412ee2752b - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:e693177419801fcd43d4b6533cd7a84376e9b8e0f3b8cfa9af56e2ad966d8cdf + digest: sha256:d6f4e85d6837c9fcba5bc93d5e035f5817704a9493dad998ea9ce044bd38ebfe - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:0185c66b6ff250fddb837d5bcafcd87f089012e9157254d356f72a2620327eab + digest: sha256:5732530deadb18fb0d7e2180232d8a34e7019dbe5b8d3876bf0b0a87d18f4b0f patches: - patch: |- @@ -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:e693177419801fcd43d4b6533cd7a84376e9b8e0f3b8cfa9af56e2ad966d8cdf + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d6f4e85d6837c9fcba5bc93d5e035f5817704a9493dad998ea9ce044bd38ebfe - 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:07b661c9716cbd968702e3574c5d0ba31cabf49257f75210b118f96858e06662 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7ed78ccfb7f7bc989643ed325ad23e865bd2181eee0db5a89aabab412ee2752b 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 eacdfc9180..b2a1efec67 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-2026-05-17-192124" + "base": "4.17.0-0.nightly-arm64-2026-05-20-034303" }, "images": { "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e315f4f8468d4ba42e05f3d9d6fa7ce648feaf7a02e9164e8d1222d5d8381f1e", 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 67ecab0a87..f1e9f18984 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-2026-05-14-020539" + "base": "4.17.0-0.nightly-2026-05-20-004318" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:07b661c9716cbd968702e3574c5d0ba31cabf49257f75210b118f96858e06662", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e693177419801fcd43d4b6533cd7a84376e9b8e0f3b8cfa9af56e2ad966d8cdf", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0185c66b6ff250fddb837d5bcafcd87f089012e9157254d356f72a2620327eab" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7ed78ccfb7f7bc989643ed325ad23e865bd2181eee0db5a89aabab412ee2752b", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d6f4e85d6837c9fcba5bc93d5e035f5817704a9493dad998ea9ce044bd38ebfe", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5732530deadb18fb0d7e2180232d8a34e7019dbe5b8d3876bf0b0a87d18f4b0f" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 2db778d824..05408d7b17 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.17.0-0.nightly-arm64-2026-05-17-192124" + "base": "4.17.0-0.nightly-arm64-2026-05-20-034303" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:063c0304b658dd3aa1436de5c6ca6047e2878c7eb2d9b72a094efc1212fb420d", diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 39c044f4c3..0cff2b0162 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,17 +1,17 @@ { "release": { - "base": "4.17.0-0.nightly-2026-05-14-020539" + "base": "4.17.0-0.nightly-2026-05-20-004318" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:99dc8acde9c74101b6506ed9421eac006d1471ed37e9a1d3a17aa087ebd4fdb5", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4bed030d021269dabadd0c7e806aaa7dbd7887ba7c2c56a3710b5b938b02662d", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:98148a6bf8f6cbea062e4bd0704898717bfdac9dd8db28782426852f4095d445", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0185c66b6ff250fddb837d5bcafcd87f089012e9157254d356f72a2620327eab", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:99a46759bb6ad1c814ec2eeb89869cbafb325e8d1ec3ae747ac0943cc4e2c9c7", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b0d50636515e3f2c7ecdd7f06feaeb3cf62bb44ffdee2b65f2ad31a52d5f9a71", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:befc624699ad8cb35dea491cd6f5ee8dc1313032368e186b4afb4ad24cf19246", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f846bdafa3d889baf7f2535b7635a4d90e03881016081959de42282d0f077371", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d19a324fe7ad20dc539af45e5e43f906e5e935f92717c68b46e02205ebb73972", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:36aa321a87416a6c57a650a48689afd532986b720943bf14e7d64f487dc00deb", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5732530deadb18fb0d7e2180232d8a34e7019dbe5b8d3876bf0b0a87d18f4b0f", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:49d80b3d61f21ea1d024b647c1a4d40ec83f5a49d1a518f77f99fb1b934431a1", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8dd1eb1314ebc6457ebc60ab1eee9f3c56bf4152d0ce28b8eea314e9889a3f43", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ccd6db738afde39d7e45c7ba7aad153e6fc427e2061f192eec52b1b892b66796", "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:bd6dc4d6e90fdbcdb844759e203c9c591abc5ac29a956257a90bda101a37b76e", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:628e7675bc72eecdc174f3b3320c1535cbff107cfeb23e24583a6605568e823d", - "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ac3238ec2c459e14e093b4272861021767f842ba157084bb18064402a602179b" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4aa0015247739f8071df03b02df3c0816366a543e974c77ca60dbb89234f60fe", + "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:27f6f80cff7eebd303c483592c999f46a068a9ef72d51f8ea46d0235b462b05e" } } From 87d2c4bc636d5cd87899b58e16f6af8dd441e7f6 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 21 May 2026 04:19:36 +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 520da27a7b..39e67c3079 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.17.0-0.nightly-arm64-2026-05-17-192124 +OCP_VERSION := 4.17.0-0.nightly-arm64-2026-05-20-034303 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index 042c3ab5c7..edc05ef1a3 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.17.0-0.nightly-2026-05-14-020539 +OCP_VERSION := 4.17.0-0.nightly-2026-05-20-004318