From d52ad53d337b6cb60fdf819f51516d2960250c3f Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 13 Jun 2024 04:10:24 +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 4da33bb0c6..806f165154 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.15.0-0.nightly-2024-06-11-200645" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.15.0-0.nightly-arm64-2024-06-11-233153" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.15.0-0.nightly-2024-06-11-200645" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.15.0-0.nightly-arm64-2024-06-12-223752" From bc722ff156c9195c37c01e34e423e99d8af54e15 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 13 Jun 2024 04:10:24 +0000 Subject: [PATCH 2/4] update changelog --- scripts/auto-rebase/changelog.txt | 9 --------- 1 file changed, 9 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 4b2833fd88..e69de29bb2 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,9 +0,0 @@ -- machine-config-operator embedded-component aaf1a8d2265fe934977300a229fde6d49166646f to 4a4385ccb8c61013b04e5699d4a8d148e6e2a535 - - a80a795e 2024-06-06T12:55:17+00:00 manifests: set required-scc for openshift workloads - -- oc image-amd64 7693229513083646fe3a83a0fec6e651e4866d8d to 44edfb50c55756395abc844fc4f7edb19dfefa50 - - b9c28eea 2024-06-10T13:14:20+03:00 Bump joelanford/ignore to bump go-git to 5.11.0 - -- oc image-arm64 7693229513083646fe3a83a0fec6e651e4866d8d to 44edfb50c55756395abc844fc4f7edb19dfefa50 - - b9c28eea 2024-06-10T13:14:20+03:00 Bump joelanford/ignore to bump go-git to 5.11.0 - From b897877e6c5dbcfdf039cc28e0971c8154c0e281 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 13 Jun 2024 04:11:02 +0000 Subject: [PATCH 3/4] update manifests --- .../operator-lifecycle-manager/release-olm-aarch64.json | 2 +- assets/release/release-aarch64.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json index ea3385dacf..0a938bb31a 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.15.0-0.nightly-arm64-2024-06-11-233153" + "base": "4.15.0-0.nightly-arm64-2024-06-12-223752" }, "images": { "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:518b56b3ec1e32071ed70f544ba3003583bdc8327bc96f2ab3591f3eb662d1b3", diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 91fc34d64a..082ff957f3 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.15.0-0.nightly-arm64-2024-06-11-233153" + "base": "4.15.0-0.nightly-arm64-2024-06-12-223752" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a4a6cfbf67a0a5b81c6a4d5eb9eec5cd7671faf813df9e04fb3c5b80e5c1ee8b", From 88cd7f176983e08da73b9c82d02b1d842edac54b Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 13 Jun 2024 04:11:03 +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 e31662479e..262ffd3e40 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.15.0-0.nightly-arm64-2024-06-11-233153 +OCP_VERSION := 4.15.0-0.nightly-arm64-2024-06-12-223752