Skip to content

Commit 55ad66f

Browse files
microshift-rebase-script[bot]ci-robot
andauthored
NO-ISSUE: rebase-4.14.0-0.nightly-2023-11-28-181957_amd64-2023-11-28_arm64-2023-11-28 (#2666)
* update last_rebase.sh * update changelog * update manifests * update buildfiles --------- Co-authored-by: ci-robot <ci-robot@openshift.io>
1 parent 05867fa commit 55ad66f

File tree

7 files changed

+8
-12
lines changed

7 files changed

+8
-12
lines changed

Makefile.version.aarch64.var

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
OCP_VERSION := 4.14.0-0.nightly-arm64-2023-11-27-001137
1+
OCP_VERSION := 4.14.0-0.nightly-arm64-2023-11-28-194629

Makefile.version.x86_64.var

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
OCP_VERSION := 4.14.0-0.nightly-2023-11-25-091215
1+
OCP_VERSION := 4.14.0-0.nightly-2023-11-28-181957

assets/release/release-aarch64.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"release": {
3-
"base": "4.14.0-0.nightly-arm64-2023-11-27-001137"
3+
"base": "4.14.0-0.nightly-arm64-2023-11-28-194629"
44
},
55
"images": {
66
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c86512dda27777916d9ede64ddc1d0ca64e246ad63e190093c604fd4da2aa8ef",

assets/release/release-x86_64.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"release": {
3-
"base": "4.14.0-0.nightly-2023-11-25-091215"
3+
"base": "4.14.0-0.nightly-2023-11-28-181957"
44
},
55
"images": {
66
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f1cdb58a08536687708c22cbffed5a0524a32fabe593d9af074e0aee4adf869d",

scripts/auto-rebase/changelog.txt

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
- cluster-csi-snapshot-controller-operator embedded-component 5d8bae88fdceefd3cc6e9befe3da641839403d9c to 73dc400fbbbd7dc131c98199e3b5c5cac957ee83
2-
- fa7d1b2 2023-11-08T13:24:44-05:00 CVE-2023-44487: bump github.com/openshift/library-go to release-4.14
3-
4-
- cluster-network-operator embedded-component 75a0a6c043df981dcf8e23e78b5254d3a68bd5ee to 73a1db2e64e320fd2584b85c68c0bc8bfe6010cc
5-
- 67929e9 2023-10-25T01:48:51+00:00 OCPBUGS-19370: Added HCP labels to CNO pods
6-
- 599c168 2023-10-23T22:10:32+00:00 hypershift: adjust backoff on infrastructure name retry
1+
- cluster-openshift-controller-manager-operator embedded-component 04cec68a4cd060be0f324db5d30f02476a85d20e to 77e0d6a07854665a7e9c8458db67e25d02da934a
2+
- 90449dd 2023-11-21T12:13:08+03:00 Remove blockage of ConfigObserver by build informer has synced flag
73

scripts/auto-rebase/commits.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ https://github.com/openshift/cluster-kube-apiserver-operator embedded-component
55
https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component bc9ef03545147204bf6692d02db8e167a023ff44
66
https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 6e43991c07e36757a00c4ec26888e040917cf2df
77
https://github.com/openshift/cluster-network-operator embedded-component 73a1db2e64e320fd2584b85c68c0bc8bfe6010cc
8-
https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 04cec68a4cd060be0f324db5d30f02476a85d20e
8+
https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 77e0d6a07854665a7e9c8458db67e25d02da934a
99
https://github.com/openshift/cluster-policy-controller embedded-component 219f6f6f072d867201d4923d39fd8bcaecbe7c59
1010
https://github.com/openshift/csi-external-snapshotter embedded-component 0bf9276611e57cb87a05576c974fea1c38e3eb96
1111
https://github.com/openshift/etcd embedded-component ba21c5bca59afce3800577c1cbb073c5556ca990

scripts/auto-rebase/last_rebase.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#!/bin/bash -x
2-
./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"
2+
./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"

0 commit comments

Comments
 (0)