From 283a8ba89c72a19809aa4252ad4787f06fb38745 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Fri, 27 Dec 2024 04:40:58 +0000 Subject: [PATCH 1/3] 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 f96bad2c60..9770556fce 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.19.0-0.nightly-2024-12-24-213048" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.19.0-0.nightly-arm64-2024-12-24-223045" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.19.0-0.nightly-2024-12-26-180804" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.19.0-0.nightly-arm64-2024-12-26-180805" From ab6b731a53bbab21dbf5f58e8704df7b3e5e625e Mon Sep 17 00:00:00 2001 From: ci-robot Date: Fri, 27 Dec 2024 04:41:25 +0000 Subject: [PATCH 2/3] update manifests --- assets/optional/multus/release-multus-aarch64.json | 2 +- assets/optional/multus/release-multus-x86_64.json | 2 +- .../operator-lifecycle-manager/release-olm-aarch64.json | 2 +- .../optional/operator-lifecycle-manager/release-olm-x86_64.json | 2 +- assets/release/release-aarch64.json | 2 +- assets/release/release-x86_64.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/assets/optional/multus/release-multus-aarch64.json b/assets/optional/multus/release-multus-aarch64.json index ab0bf9a049..d1d3404816 100644 --- a/assets/optional/multus/release-multus-aarch64.json +++ b/assets/optional/multus/release-multus-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.19.0-0.nightly-arm64-2024-12-24-223045" + "base": "4.19.0-0.nightly-arm64-2024-12-26-180805" }, "images": { "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4ecfae89c530c3bc40085299a973fea1d8ec7e237212d7a7296f455ba852b478", diff --git a/assets/optional/multus/release-multus-x86_64.json b/assets/optional/multus/release-multus-x86_64.json index 5240507e10..ece2585237 100644 --- a/assets/optional/multus/release-multus-x86_64.json +++ b/assets/optional/multus/release-multus-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.19.0-0.nightly-2024-12-24-213048" + "base": "4.19.0-0.nightly-2024-12-26-180804" }, "images": { "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1ba87d15e49bf4b0ec404e0ad6c2ee4f2c20cfc2bdd5fb725136a157dc2ad2f1", diff --git a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json index 9336ffb982..28b9425491 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.19.0-0.nightly-arm64-2024-12-24-223045" + "base": "4.19.0-0.nightly-arm64-2024-12-26-180805" }, "images": { "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5198dd1e09caa1ffa728636b52582cb4decca2211815ce16412ea59395f2fc30", 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 46d5cd55d3..72638d0803 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.19.0-0.nightly-2024-12-24-213048" + "base": "4.19.0-0.nightly-2024-12-26-180804" }, "images": { "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cd702a31c36add2ac295d1719a90325ebca8108df2a85ef37a00dc2d54e8ad04", diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 6107eca186..666b1e3908 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.19.0-0.nightly-arm64-2024-12-24-223045" + "base": "4.19.0-0.nightly-arm64-2024-12-26-180805" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:50f1aa40a784505aa06d99ba8550b947b2a6f948675e46c4d8d7e0e41131c390", diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 1dc39761c2..ee26ea9b2b 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.19.0-0.nightly-2024-12-24-213048" + "base": "4.19.0-0.nightly-2024-12-26-180804" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:36cd18d28cc0b664aa2dbfa3c08e0b69a240642f5d1c3c7021670e8a1e11c75a", From 8e27a44984d13f6998b98816c665188b6ff25b99 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Fri, 27 Dec 2024 04:41:26 +0000 Subject: [PATCH 3/3] update buildfiles --- Makefile.version.aarch64.var | 2 +- Makefile.version.x86_64.var | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index fdcefdd546..e2d58f15ad 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.19.0-0.nightly-arm64-2024-12-24-223045 +OCP_VERSION := 4.19.0-0.nightly-arm64-2024-12-26-180805 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index 9f7b91f2b3..4266ab3280 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.19.0-0.nightly-2024-12-24-213048 +OCP_VERSION := 4.19.0-0.nightly-2024-12-26-180804