Skip to content

Commit b36526e

Browse files
microshift-rebase-script[bot]ci-robot
andauthored
NO-ISSUE: rebase-4.14.0-0.nightly-2023-11-25-091215_amd64-2023-11-25_arm64-2023-11-27 (#2656)
* update last_rebase.sh * update changelog * update manifests * update buildfiles --------- Co-authored-by: ci-robot <ci-robot@openshift.io>
1 parent 151e424 commit b36526e

File tree

7 files changed

+12
-11
lines changed

7 files changed

+12
-11
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-24-014114
1+
OCP_VERSION := 4.14.0-0.nightly-arm64-2023-11-27-001137

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-23-154014
1+
OCP_VERSION := 4.14.0-0.nightly-2023-11-25-091215

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-24-014114"
3+
"base": "4.14.0-0.nightly-arm64-2023-11-27-001137"
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-23-154014"
3+
"base": "4.14.0-0.nightly-2023-11-25-091215"
44
},
55
"images": {
66
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f1cdb58a08536687708c22cbffed5a0524a32fabe593d9af074e0aee4adf869d",

scripts/auto-rebase/changelog.txt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
- cluster-network-operator embedded-component 4cd5c10d6423582ceef639a822b929788ac2c9a0 to 75a0a6c043df981dcf8e23e78b5254d3a68bd5ee
2-
- 57ecd29 2023-11-22T10:00:01+01:00 Block upgrades to 4.15 with Kuryr
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
33

4-
- machine-config-operator embedded-component a6cdd850c44f8809b10a057202ccd502a21c33fc to 612c6f6bfa3ca777f9f1e260596b801c3e66375f
5-
- 4ec9bb19 2023-11-21T03:36:58+00:00 OCPBUGS-23432: Use shorter IP label for keepalived VIP
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
67

scripts/auto-rebase/commits.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component 5d8bae88fdceefd3cc6e9befe3da641839403d9c
1+
https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component 73dc400fbbbd7dc131c98199e3b5c5cac957ee83
22
https://github.com/openshift/cluster-dns-operator embedded-component 5553a22698ac7fce2cc401ed5884eb1bdb36a02d
33
https://github.com/openshift/cluster-ingress-operator embedded-component d876f5ab48e3748057ec196d90b6f7aae633b081
44
https://github.com/openshift/cluster-kube-apiserver-operator embedded-component d52dbad1177fdb0d27077be5b6e8d9fe0d41b30e
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
7-
https://github.com/openshift/cluster-network-operator embedded-component 75a0a6c043df981dcf8e23e78b5254d3a68bd5ee
7+
https://github.com/openshift/cluster-network-operator embedded-component 73a1db2e64e320fd2584b85c68c0bc8bfe6010cc
88
https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 04cec68a4cd060be0f324db5d30f02476a85d20e
99
https://github.com/openshift/cluster-policy-controller embedded-component 219f6f6f072d867201d4923d39fd8bcaecbe7c59
1010
https://github.com/openshift/csi-external-snapshotter embedded-component 0bf9276611e57cb87a05576c974fea1c38e3eb96

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-23-154014" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2023-11-24-014114"
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"

0 commit comments

Comments
 (0)