From 7b293fe36488f4d617fece041a289cb448df5feb Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 23 Jan 2025 04:20:08 +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 83a8cc8be4..de588d74c4 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-2025-01-19-193149" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2025-01-19-193147" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.14.0-0.nightly-2025-01-22-024525" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2025-01-22-193147" From c0b4d425e40071a41ad560852c12800910cf4dc5 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 23 Jan 2025 04:20:08 +0000 Subject: [PATCH 2/4] update changelog --- scripts/auto-rebase/changelog.txt | 4 ++-- scripts/auto-rebase/commits.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 1fe0b8776d..795c285b59 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,3 +1,3 @@ -- cluster-network-operator embedded-component 9a0391243931ff480885f5dbcee8e34a1212aeb7 to 8ad9fcdadcbc0cae358f7e277349d194b32e8277 - - defa7da 2025-01-16T03:36:23-05:00 Pass transit_switch_subnet options in ovnkube-node pod for single-zone +- openshift-controller-manager embedded-component a25aab6f01ae68758978ca449a640d75c25562f4 to 6e86dee5d30921e84f557ca214022e587c824e88 + - 5db1854 2025-01-16T07:14:31+00:00 NO-JIRA: Add team members to the OWNERS file diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 027d11e091..7c6a3aff7f 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -12,7 +12,7 @@ https://github.com/openshift/etcd embedded-component 5ed5044c5661c55d297ab034805 https://github.com/openshift/kubernetes embedded-component 03a907c6d182353a0e9b83a224a6f0398406f6d5 https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 8558e14a116804168506d06e96eac5a79913a6eb https://github.com/openshift/machine-config-operator embedded-component 4f8b6f2a0e1a8ec475e5ef1dd8effd9306804518 -https://github.com/openshift/openshift-controller-manager embedded-component a25aab6f01ae68758978ca449a640d75c25562f4 +https://github.com/openshift/openshift-controller-manager embedded-component 6e86dee5d30921e84f557ca214022e587c824e88 https://github.com/openshift/route-controller-manager embedded-component 1a5e72f41b21f5ebcd6f9dd8227d92ad1fffbb1e https://github.com/openshift/service-ca-operator embedded-component 3c3f82f7112ee4b5656e5c554f9887acdf881175 https://github.com/openshift/oc image-amd64 44b3ac26e654777e0283759d45a2b3351823fc5e From c473e6291b31dcde782c9943cd1e9f5ea1e59be8 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 23 Jan 2025 04:20:42 +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 986b5b2acf..1bafe906a3 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-2025-01-19-193147" + "base": "4.14.0-0.nightly-arm64-2025-01-22-193147" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cbe6b253acb5398a684f503b0ddc0111bc21f422c951d689d31c12cf82bc67a3", diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 436e8fd3e7..b9b66da4bf 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-2025-01-19-193149" + "base": "4.14.0-0.nightly-2025-01-22-024525" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5a5527750e07a3bbc64e2b64fd712c12125b1e6f9e310124f6aea36684724d8f", From ce788859c70f43e8c958683f1140dca37d332fe0 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 23 Jan 2025 04:20:47 +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 5b7b53a359..583f45a687 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.14.0-0.nightly-arm64-2025-01-19-193147 +OCP_VERSION := 4.14.0-0.nightly-arm64-2025-01-22-193147 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index e3860f4fd8..6dfd9096b8 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.14.0-0.nightly-2025-01-19-193149 +OCP_VERSION := 4.14.0-0.nightly-2025-01-22-024525