From 8841d1bf8b36ea419ff095634bfa1312412f3c4e Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 5 Jun 2024 04:10:51 +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 e89df58978..35f3f67ea5 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.16.0-0.nightly-2024-06-03-060250" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.16.0-0.nightly-arm64-2024-06-03-200520" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.16.0-0.nightly-2024-06-03-060250" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.16.0-0.nightly-arm64-2024-06-04-202724" From 5ae21e64ad4eb6e214f0a0096df77e39f148880f Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 5 Jun 2024 04:10:51 +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 6e9a5f2397..e69de29bb2 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,3 +0,0 @@ -- oc image-arm64 12a2e98239d503af3e8e30a6fa9d0186c9524b77 to f9d6c50fee8b143733f9a0d210d1095b5e5ff77d - - eacf0666 2024-05-20T14:43:41+00:00 pkg/cli/admin/upgrade/rollback: Gate on OC_ENABLE_CMD_UPGRADE_ROLLBACK - From e0e6349ed3118a837094d90e8a170ba8be9587eb Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 5 Jun 2024 04:11:25 +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 4b59c6f8ce..926013166f 100644 --- a/assets/optional/multus/release-multus-aarch64.json +++ b/assets/optional/multus/release-multus-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.16.0-0.nightly-arm64-2024-06-03-200520" + "base": "4.16.0-0.nightly-arm64-2024-06-04-202724" }, "images": { "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2dfb3b49a0d6fa10f589ecacc8578f7447c830d3dcd24006811721ada8329a94", diff --git a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json index c4b14bd065..4bfe58bf42 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.16.0-0.nightly-arm64-2024-06-03-200520" + "base": "4.16.0-0.nightly-arm64-2024-06-04-202724" }, "images": { "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8b6455e0dbc02ff431a1adc06beb7a916b438b0edca6c316aaff184da8d538e2", diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index d379a8512e..7b0e8e5fe5 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.16.0-0.nightly-arm64-2024-06-03-200520" + "base": "4.16.0-0.nightly-arm64-2024-06-04-202724" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:25ae0e9de662ea4bbf205b541c7e71a8027cae205b402bce52845232e4d1045b", From 4de87dfd4c40989a761c26f2c850aa2829552d5b Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 5 Jun 2024 04:11:29 +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 6cb4db7a0d..08a9233670 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.16.0-0.nightly-arm64-2024-06-03-200520 +OCP_VERSION := 4.16.0-0.nightly-arm64-2024-06-04-202724