diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index e236f90b96..16ef79929e 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.22.0-0.nightly-arm64-2026-05-25-031550 +OCP_VERSION := 4.22.0-0.nightly-arm64-2026-05-26-031550 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index a9c13be628..1153ce0320 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.22.0-0.nightly-2026-05-24-183203 +OCP_VERSION := 4.22.0-0.nightly-2026-05-25-200009 diff --git a/assets/components/multus/release-multus-aarch64.json b/assets/components/multus/release-multus-aarch64.json index f0fbf01e7b..7bea5045ed 100644 --- a/assets/components/multus/release-multus-aarch64.json +++ b/assets/components/multus/release-multus-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.22.0-0.nightly-arm64-2026-05-25-031550" + "base": "4.22.0-0.nightly-arm64-2026-05-26-031550" }, "images": { "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c9c22af7518b9eb10a194ab512b1bd8e64bc7037e2fbc7937904a267006aaf35", diff --git a/assets/components/multus/release-multus-x86_64.json b/assets/components/multus/release-multus-x86_64.json index 32836dd5f3..f883ffe7d5 100644 --- a/assets/components/multus/release-multus-x86_64.json +++ b/assets/components/multus/release-multus-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.22.0-0.nightly-2026-05-24-183203" + "base": "4.22.0-0.nightly-2026-05-25-200009" }, "images": { "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:180f0ea11339d6aacfc67a58100c55c2bf522eef902b7a6e72f331c72b82a463", diff --git a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json index 64a5e8c14e..201100b9dd 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.22.0-0.nightly-arm64-2026-05-25-031550" + "base": "4.22.0-0.nightly-arm64-2026-05-26-031550" }, "images": { "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:33c1a7ca2342f7f593e74b18b213b4624870902837db8be00bce9485a7ccff68", 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 e0c17a823a..313d5fcc7e 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.22.0-0.nightly-2026-05-24-183203" + "base": "4.22.0-0.nightly-2026-05-25-200009" }, "images": { "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e1b7d61ea83cfc159a595ac1d130a6d326fbc791bafbe95f7a084ff45203f6e4", diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 7a4d62f4ce..e27161b3b2 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.22.0-0.nightly-arm64-2026-05-25-031550" + "base": "4.22.0-0.nightly-arm64-2026-05-26-031550" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7c0b4d1b5ca0667af3982ccf71218286269d397d7de057447a6f0dcab3916d89", diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index fe35894527..021e386504 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.22.0-0.nightly-2026-05-24-183203" + "base": "4.22.0-0.nightly-2026-05-25-200009" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1c59b20f197f3c61b0d4c92b7aabdc73f4da325ff8ee2e0dac8cc472b9dc9d19", diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 5d23045db9..e69de29bb2 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,16 +0,0 @@ -- cluster-ingress-operator embedded-component 52c2b0465ecf1dcdcd57c010b9b15ac28f62a2ba to 8ae91f62ca9e6ca1f210b815ab54edbae856ac4c - - 76744ed 2026-05-19T09:11:15Z OCPBUGS-83923: Vendor updates for grpc-go and x/net - - a0d7041 2026-05-19T09:11:15Z OCPBUGS-83923: Update grpc-go and x/net - -- oc image-amd64 66dee73f66c4f048c333c6a77d76871872027896 to 062bc5449c4987c92c76da4d315ef4969c22d638 - - 1582d6c0 2026-05-06T01:05:51Z OCPBUGS-62799: Add required-scc annotation to node-joiner pod to prevent third-party SCC interference - -- router image-amd64 896390778ebe15f57f87e6ca78f11c96e64c2652 to 1d980e1d4c65832893e91150df92fc6ad1932d89 - - 39e7d40 2026-05-19T12:50:01-04:00 Bump google.golang.org/grpc to v1.79.3 - -- oc image-arm64 66dee73f66c4f048c333c6a77d76871872027896 to 062bc5449c4987c92c76da4d315ef4969c22d638 - - 1582d6c0 2026-05-06T01:05:51Z OCPBUGS-62799: Add required-scc annotation to node-joiner pod to prevent third-party SCC interference - -- router image-arm64 896390778ebe15f57f87e6ca78f11c96e64c2652 to 1d980e1d4c65832893e91150df92fc6ad1932d89 - - 39e7d40 2026-05-19T12:50:01-04:00 Bump google.golang.org/grpc to v1.79.3 - diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index bf209f4e15..1ea8545695 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.22.0-0.nightly-2026-05-24-183203" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.22.0-0.nightly-arm64-2026-05-25-031550" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.22.0-0.nightly-2026-05-25-200009" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.22.0-0.nightly-arm64-2026-05-26-031550"