From 7637b11417a0ce0d7e5625c2e7b47f57f6586446 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 2 Apr 2026 04:13:45 +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 3ebaf1dd0a..b8658c0e14 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.18.0-0.nightly-2026-03-26-041753" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2026-03-29-232143" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.18.0-0.nightly-2026-03-26-041753" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2026-04-01-232144" From 5fef0e10dbe47931f1345ab56bd01b287b99d0f2 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 2 Apr 2026 04:13:46 +0000 Subject: [PATCH 2/4] update changelog --- scripts/auto-rebase/changelog.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 1294cf0db9..e69de29bb2 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,3 +0,0 @@ -- machine-config-operator embedded-component ddf9a058799932c22942bdbef849178a6321c883 to 7d117b24b0419a2297f4f087d52b12a72cc89c88 - - f4f819c0 2026-03-25T01:24:44+00:00 create default-timeout-stop dropin - From 5c3cb0acd9e984e74c5e4dfdac2cd48a0aaf05b8 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 2 Apr 2026 04:15:29 +0000 Subject: [PATCH 3/4] update manifests --- assets/optional/multus/release-multus-aarch64.json | 2 +- .../operator-lifecycle-manager/kustomization.aarch64.yaml | 8 ++++---- .../operator-lifecycle-manager/release-olm-aarch64.json | 6 +++--- assets/release/release-aarch64.json | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/assets/optional/multus/release-multus-aarch64.json b/assets/optional/multus/release-multus-aarch64.json index 2381598b36..e5e5eaa483 100644 --- a/assets/optional/multus/release-multus-aarch64.json +++ b/assets/optional/multus/release-multus-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.18.0-0.nightly-arm64-2026-03-29-232143" + "base": "4.18.0-0.nightly-arm64-2026-04-01-232144" }, "images": { "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:91edf5679018055bc2cb9189d05aee7f35f339ad6e8abf7e1ef37a90c3c6ff35", diff --git a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml index 59194b27bd..42c22d6645 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.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:cec1e663c9b454cb05355c22f1594606692c4e145f35b83c40a723e68c6655e3 + digest: sha256:80cf4182b92e8a5baf4bddec2e8000ff41ccced7abfb674bbdac9681a16d90aa - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:84351aee4592ae4e007cb5c5ed11722f7464a57c92fcc14bd2e3e57df89cdb30 + digest: sha256:bf7796a72d725021fd1416e93b53535d9ea7adc7bf3168bde1ca2589a637253c - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev digest: sha256:929d27000955d2ca2913ba8a380e0311762522a5c1cd6a8ae1790d6f1d7b4e57 @@ -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:84351aee4592ae4e007cb5c5ed11722f7464a57c92fcc14bd2e3e57df89cdb30 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bf7796a72d725021fd1416e93b53535d9ea7adc7bf3168bde1ca2589a637253c - 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:cec1e663c9b454cb05355c22f1594606692c4e145f35b83c40a723e68c6655e3 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:80cf4182b92e8a5baf4bddec2e8000ff41ccced7abfb674bbdac9681a16d90aa 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 8acba4d78c..3cf1db65da 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json @@ -1,10 +1,10 @@ { "release": { - "base": "4.18.0-0.nightly-arm64-2026-03-29-232143" + "base": "4.18.0-0.nightly-arm64-2026-04-01-232144" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cec1e663c9b454cb05355c22f1594606692c4e145f35b83c40a723e68c6655e3", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:84351aee4592ae4e007cb5c5ed11722f7464a57c92fcc14bd2e3e57df89cdb30", + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:80cf4182b92e8a5baf4bddec2e8000ff41ccced7abfb674bbdac9681a16d90aa", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bf7796a72d725021fd1416e93b53535d9ea7adc7bf3168bde1ca2589a637253c", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:929d27000955d2ca2913ba8a380e0311762522a5c1cd6a8ae1790d6f1d7b4e57" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 8cb22b8d67..01cddb263a 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.18.0-0.nightly-arm64-2026-03-29-232143" + "base": "4.18.0-0.nightly-arm64-2026-04-01-232144" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bd5bcf11f7984af4287c26d66c2998238246f0c5c33676ab2fa0dd0c3ff35913", From 5f3d17ac7230a99e8139bed64cd423d6acd66a4d Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 2 Apr 2026 04:15:30 +0000 Subject: [PATCH 4/4] update buildfiles --- Makefile.version.aarch64.var | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index 189d2a6a91..c0d15f5ad0 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.18.0-0.nightly-arm64-2026-03-29-232143 +OCP_VERSION := 4.18.0-0.nightly-arm64-2026-04-01-232144