From 9ba967ade8f0cd12620dea374210d19893078468 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 4 Jun 2024 04:22:02 +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 71694d806a..4994404108 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-2024-05-24-193308" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2024-06-02-224131" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.17.0-0.nightly-2024-05-24-193308" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2024-06-03-194837" From 22d5efa1a5ce6505b7525922a749086d9b37aa02 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 4 Jun 2024 04:22:03 +0000 Subject: [PATCH 2/4] update changelog --- scripts/auto-rebase/changelog.txt | 6 ------ 1 file changed, 6 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 6c31d8c8c2..e69de29bb2 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,6 +0,0 @@ -- oc image-arm64 d5b5b3a62fa4743a9e7a9cd4779b08d7f3e58c31 to 0bea0594b2cdb44de33be3a96f8ac2cf68e10ee2 - - 75151619 2024-05-31T16:59:04+02:00 `upgrade status`: polish alert insights - - 4b531b2d 2024-05-30T17:10:08+02:00 pkg/cli/expose: override print flags for cmd - - 18405673 2024-05-30T17:10:08+02:00 pkg/cli/create,pkg/cli/expose: use custom scheme - - 109236a1 2024-05-30T17:10:03+02:00 pkg/helpers/scheme: stop loading legacy schemes on global scheme - From d098f7ce626210745d33cfce45712f92ccf7fae4 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 4 Jun 2024 04:22:41 +0000 Subject: [PATCH 3/4] update manifests --- assets/optional/multus/release-multus-aarch64.json | 2 +- .../operator-lifecycle-manager/release-olm-aarch64.json | 2 +- assets/release/release-aarch64.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/optional/multus/release-multus-aarch64.json b/assets/optional/multus/release-multus-aarch64.json index 544017abdc..f4fb36a56e 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-2024-06-02-224131" + "base": "4.17.0-0.nightly-arm64-2024-06-03-194837" }, "images": { "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:784ffaf9726c83ff250cdba0952745f9dcd32a8c76642aea6b8a469578921df3", diff --git a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json index d7bc34346b..491c884d5d 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-2024-06-02-224131" + "base": "4.17.0-0.nightly-arm64-2024-06-03-194837" }, "images": { "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0b13cf2ff7feeab314f8a6a61d7518e7f5bfbfdd344bda075bd824c8ffae38be", diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index d94a2617a9..fb5fd5d3da 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-2024-06-02-224131" + "base": "4.17.0-0.nightly-arm64-2024-06-03-194837" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:40d3fe3e0988d8ab81c8d48d8395647e1339772e8f7e415f81b2741cddee5d4b", From 4ab455be18fc20e60d64f5fd0cde49379e32427b Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 4 Jun 2024 04:22:50 +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 122a7c406e..d731bbdd10 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.17.0-0.nightly-arm64-2024-06-02-224131 +OCP_VERSION := 4.17.0-0.nightly-arm64-2024-06-03-194837