Skip to content

NO-ISSUE: rebase-release-4.18-4.18.0-0.nightly-2025-01-02-095926_amd64-2025-01-02_arm64-2025-01-02 #4377

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
merged 4 commits into from
Jan 3, 2025
Merged

NO-ISSUE: rebase-release-4.18-4.18.0-0.nightly-2025-01-02-095926_amd64-2025-01-02_arm64-2025-01-02 #4377

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
65b3f2e
update last_rebase.sh
Jan 3, 2025
259da0c
update changelog
Jan 3, 2025
d88f1b2
update manifests
Jan 3, 2025
946c6c5
update buildfiles
Jan 3, 2025
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.18.0-0.nightly-arm64-2024-12-30-175629
OCP_VERSION := 4.18.0-0.nightly-arm64-2025-01-02-215913
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.18.0-0.nightly-2024-12-29-211757
OCP_VERSION := 4.18.0-0.nightly-2025-01-02-095926
2 changes: 1 addition & 1 deletion assets/optional/multus/release-multus-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.18.0-0.nightly-arm64-2024-12-30-175629"
"base": "4.18.0-0.nightly-arm64-2025-01-02-215913"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:05394287fd690e589778264f7272c968e4cf87137005272af48082729d35c5af",
Expand Down
2 changes: 1 addition & 1 deletion assets/optional/multus/release-multus-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.18.0-0.nightly-2024-12-29-211757"
"base": "4.18.0-0.nightly-2025-01-02-095926"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f9561a8aebe6978367bb21b607369a9c23c7651ddb3002f7b3cdd01b18c89adf",
Expand Down
2 changes: 1 addition & 1 deletion assets/optional/operator-lifecycle-manager/release-olm-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.18.0-0.nightly-arm64-2024-12-30-175629"
"base": "4.18.0-0.nightly-arm64-2025-01-02-215913"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cb8a571aaacdbc3653d4a6b93e3e854c7f4bb8ccc4b50d47eca0df178dd935e3",
Expand Down
2 changes: 1 addition & 1 deletion assets/optional/operator-lifecycle-manager/release-olm-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.18.0-0.nightly-2024-12-29-211757"
"base": "4.18.0-0.nightly-2025-01-02-095926"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b9a495a5377a92c64bf23b5d770d6e08d7ce6f1f17716bf53bcbb9c2ac412561",
Expand Down
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.18.0-0.nightly-arm64-2024-12-30-175629"
"base": "4.18.0-0.nightly-arm64-2025-01-02-215913"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8b5be7b37095eca816e3c3742e4b14c1aa4cd9b43c73d555de4233109a7b224c",
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.18.0-0.nightly-2024-12-29-211757"
"base": "4.18.0-0.nightly-2025-01-02-095926"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:035d06c0fc13e38da7d622d42764315273b4f55db6d8e6f1c89d95461c0aa263",
Expand Down
3 changes: 3 additions & 0 deletions scripts/auto-rebase/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- machine-config-operator embedded-component b05eb03a96b8a886e0389ce4762a6ad29d91c36a to c9bd3ae71c5c31dba32911f963f3da51c566362f
- b2925413 2024-12-04T04:11:51+00:00 operator: retry if images.json has a mismatch

2 changes: 1 addition & 1 deletion scripts/auto-rebase/commits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ https://github.com/openshift/csi-external-snapshotter embedded-component f52ce8b
https://github.com/openshift/etcd embedded-component 914783cae63a13b90971c65e28c3349c1ecb7dfb
https://github.com/openshift/kubernetes embedded-component 205ac00c56dd2340b90dc0e328be84e77219197c
https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 50d17147f15d8b216e7c41f91d1bd7d307ca8c73
https://github.com/openshift/machine-config-operator embedded-component b05eb03a96b8a886e0389ce4762a6ad29d91c36a
https://github.com/openshift/machine-config-operator embedded-component c9bd3ae71c5c31dba32911f963f3da51c566362f
https://github.com/openshift/openshift-controller-manager embedded-component 3ebe2f4f3900d6a3748ef0faf3535f635dbf7d11
https://github.com/openshift/operator-framework-olm embedded-component 6156b61b05d6e345db44edfa7d38138ea0373631
https://github.com/openshift/route-controller-manager embedded-component 07daee4d2f0b5c7aaca56ee45ff6dfdf97680db0
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.18.0-0.nightly-2024-12-29-211757" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2024-12-30-175629"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.18.0-0.nightly-2025-01-02-095926" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2025-01-02-215913"