From c4f2a6064f0372a69f99703015b1ef63e3b46de1 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 23 Jul 2024 04:15:19 +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 9360cb50a4..54af10ecc2 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.14.0-0.nightly-2024-07-21-081731" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2024-07-21-223644" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.14.0-0.nightly-2024-07-22-212218" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2024-07-22-234900" From 025b3f184ad6de8a91e64e18afd5239cb0616078 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 23 Jul 2024 04:15:19 +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 5621e87087..e69de29bb2 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,3 +0,0 @@ -- machine-config-operator embedded-component ea6671e27ec6683aa986b7072b022f0393a0e15a to 83226c2cde5bfd61b8e289773edae3cd7fc3f5dd - - 7ce4627c 2024-07-17T23:05:33+00:00 OCPBUGS-36863: Copy RHEL9 binaries used in HCP - From eb802c5331f9062c78c520c2e969f8b5c5df1191 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 23 Jul 2024 04:16:57 +0000 Subject: [PATCH 3/4] update manifests --- assets/release/release-aarch64.json | 2 +- assets/release/release-x86_64.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 547e2dab5d..38d88a66a6 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.14.0-0.nightly-arm64-2024-07-21-223644" + "base": "4.14.0-0.nightly-arm64-2024-07-22-234900" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:83613c6c229cb5650307efbe06b3f476d2071fe0c5cfe2286b92c9cb80dc1d33", diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 827f3b8c77..a0a0b02eb2 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.14.0-0.nightly-2024-07-21-081731" + "base": "4.14.0-0.nightly-2024-07-22-212218" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e38deab6457117c0d9423b3b16ef3dd3c4bdb4612ed2494269ef24038bd82b67", From 7111d9531a457264160fc46faaa92bce18a405fd Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 23 Jul 2024 04:17:06 +0000 Subject: [PATCH 4/4] 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 623aed4f04..9e88045bd3 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.14.0-0.nightly-arm64-2024-07-21-223644 +OCP_VERSION := 4.14.0-0.nightly-arm64-2024-07-22-234900 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index 19f61cf8ac..a1b9a38a13 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.14.0-0.nightly-2024-07-21-081731 +OCP_VERSION := 4.14.0-0.nightly-2024-07-22-212218