From fd2e5a22fe532d65b1ec3fd68468b01fda41e898 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 29 Nov 2023 05:05:57 +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 ce735321f8..2061475a4a 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-2023-11-25-091215" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2023-11-27-001137" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.14.0-0.nightly-2023-11-28-181957" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2023-11-28-194629" From 99f64609d741214841dfec3b86d35456700bd7f7 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 29 Nov 2023 05:05:57 +0000 Subject: [PATCH 2/4] update changelog --- scripts/auto-rebase/changelog.txt | 8 ++------ scripts/auto-rebase/commits.txt | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 151ea2e483..065cf88cfb 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,7 +1,3 @@ -- cluster-csi-snapshot-controller-operator embedded-component 5d8bae88fdceefd3cc6e9befe3da641839403d9c to 73dc400fbbbd7dc131c98199e3b5c5cac957ee83 - - fa7d1b2 2023-11-08T13:24:44-05:00 CVE-2023-44487: bump github.com/openshift/library-go to release-4.14 - -- cluster-network-operator embedded-component 75a0a6c043df981dcf8e23e78b5254d3a68bd5ee to 73a1db2e64e320fd2584b85c68c0bc8bfe6010cc - - 67929e9 2023-10-25T01:48:51+00:00 OCPBUGS-19370: Added HCP labels to CNO pods - - 599c168 2023-10-23T22:10:32+00:00 hypershift: adjust backoff on infrastructure name retry +- cluster-openshift-controller-manager-operator embedded-component 04cec68a4cd060be0f324db5d30f02476a85d20e to 77e0d6a07854665a7e9c8458db67e25d02da934a + - 90449dd 2023-11-21T12:13:08+03:00 Remove blockage of ConfigObserver by build informer has synced flag diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index fac73e6885..07d1e3093f 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -5,7 +5,7 @@ https://github.com/openshift/cluster-kube-apiserver-operator embedded-component https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component bc9ef03545147204bf6692d02db8e167a023ff44 https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 6e43991c07e36757a00c4ec26888e040917cf2df https://github.com/openshift/cluster-network-operator embedded-component 73a1db2e64e320fd2584b85c68c0bc8bfe6010cc -https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 04cec68a4cd060be0f324db5d30f02476a85d20e +https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 77e0d6a07854665a7e9c8458db67e25d02da934a https://github.com/openshift/cluster-policy-controller embedded-component 219f6f6f072d867201d4923d39fd8bcaecbe7c59 https://github.com/openshift/csi-external-snapshotter embedded-component 0bf9276611e57cb87a05576c974fea1c38e3eb96 https://github.com/openshift/etcd embedded-component ba21c5bca59afce3800577c1cbb073c5556ca990 From b3fe25df64762658c5accf8e074fbb7083c9bf42 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 29 Nov 2023 05:06:39 +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 cc9b67e3f3..d5c01b5859 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-2023-11-27-001137" + "base": "4.14.0-0.nightly-arm64-2023-11-28-194629" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c86512dda27777916d9ede64ddc1d0ca64e246ad63e190093c604fd4da2aa8ef", diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index f6004789d7..b3bb432652 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-2023-11-25-091215" + "base": "4.14.0-0.nightly-2023-11-28-181957" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f1cdb58a08536687708c22cbffed5a0524a32fabe593d9af074e0aee4adf869d", From 355008961e2c6d22603189bd7126aced2a383129 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 29 Nov 2023 05:06:45 +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 c77d2ff2ed..cc69a76c01 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.14.0-0.nightly-arm64-2023-11-27-001137 +OCP_VERSION := 4.14.0-0.nightly-arm64-2023-11-28-194629 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index 6b7778598f..6226eebde8 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.14.0-0.nightly-2023-11-25-091215 +OCP_VERSION := 4.14.0-0.nightly-2023-11-28-181957