Skip to content

rebase-4.14.0-0.nightly-2023-06-29-065352_amd64-2023-06-29_arm64-2023-06-29 #1980

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 4 commits into from
Jun 30, 2023
Merged

rebase-4.14.0-0.nightly-2023-06-29-065352_amd64-2023-06-29_arm64-2023-06-29 #1980

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5bdcf67
update last_rebase.sh
Jun 30, 2023
7309851
update changelog
Jun 30, 2023
fa890b4
update manifests
Jun 30, 2023
0fbfc24
update buildfiles
Jun 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile.version.aarch64.var
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.14.0-0.nightly-arm64-2023-06-29-004030
OCP_VERSION := 4.14.0-0.nightly-arm64-2023-06-29-194122
2 changes: 1 addition & 1 deletion Makefile.version.x86_64.var
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.14.0-0.nightly-2023-06-27-233015
OCP_VERSION := 4.14.0-0.nightly-2023-06-29-065352
2 changes: 1 addition & 1 deletion assets/release/release-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.14.0-0.nightly-arm64-2023-06-29-004030"
"base": "4.14.0-0.nightly-arm64-2023-06-29-194122"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fc2b279b251166d1978be5fe6f6a94b613f312c6448380a77fe4b3e43340d71b",
Expand Down
2 changes: 1 addition & 1 deletion assets/release/release-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.14.0-0.nightly-2023-06-27-233015"
"base": "4.14.0-0.nightly-2023-06-29-065352"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3b1fff8a7fbb0b7fef1ef652ffb95bd6fc61e8213338675d46bb455bd5be8bee",
Expand Down
210 changes: 15 additions & 195 deletions scripts/auto-rebase/changelog.txt
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions scripts/auto-rebase/commits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
https://github.com/openshift/cluster-dns-operator embedded-component 5c85a318807b790705c16816f5022d0cc31148ba
https://github.com/openshift/cluster-ingress-operator embedded-component ecb3786b1397cb93865952c98db72d1990587bd0
https://github.com/openshift/cluster-dns-operator embedded-component 47be7b57fbc7eecdd91bc3960f6bc4d7d0304133
https://github.com/openshift/cluster-ingress-operator embedded-component d0be04b7aff1bf56d36b9753019e3000cab1c179
https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 8b642494e3bffc365cb24383b416dc0f530547d9
https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 5f49f59c88c963d97dd90643e7c9fb7ef1820d0c
https://github.com/openshift/cluster-kube-scheduler-operator embedded-component db92b6d9fcf410aa24efc4a70c4114925bb7b797
Expand All @@ -8,7 +8,7 @@ https://github.com/openshift/cluster-openshift-controller-manager-operator embed
https://github.com/openshift/cluster-policy-controller embedded-component cc787e1b1e177696817b66689a03471914083a67
https://github.com/openshift/etcd embedded-component 53cdd6b0519f0e57da9032b473465799bba4b1a0
https://github.com/openshift/kubernetes embedded-component ab0b8ee0d340f945f4bb4dabeef1bffa5fe5c6cc
https://github.com/openshift/machine-config-operator embedded-component fc79ca7b7ccb23ec588aeb4a73901ca0730340b4
https://github.com/openshift/machine-config-operator embedded-component 63eb79470dd6f29d07535770d194f23ee83afc04
https://github.com/openshift/openshift-controller-manager embedded-component 2caaf6b26c07395566c38e01d6154debb9117ecc
https://github.com/openshift/route-controller-manager embedded-component 38d9ec83ce464e9198af05918ab03a7995a11866
https://github.com/openshift/service-ca-operator embedded-component f0bd313003d3d79593b44936fb7cf0bab2a6daae
Expand Down
2 changes: 1 addition & 1 deletion scripts/auto-rebase/last_rebase.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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-06-27-233015" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2023-06-29-004030" "registry.access.redhat.com/lvms4/lvms-operator-bundle:v4.12"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.14.0-0.nightly-2023-06-29-065352" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2023-06-29-194122" "registry.access.redhat.com/lvms4/lvms-operator-bundle:v4.12"