Skip to content

NO-ISSUE: rebase-main-4.19.0-0.nightly-2025-01-05-132538_amd64-2025-01-05_arm64-2025-01-05 #4384

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 6, 2025
Merged

NO-ISSUE: rebase-main-4.19.0-0.nightly-2025-01-05-132538_amd64-2025-01-05_arm64-2025-01-05 #4384

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
9c81bbe
update last_rebase.sh
Jan 6, 2025
413d1c8
update changelog
Jan 6, 2025
f75b301
update manifests
Jan 6, 2025
abd83b5
update buildfiles
Jan 6, 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.19.0-0.nightly-arm64-2025-01-02-210017
OCP_VERSION := 4.19.0-0.nightly-arm64-2025-01-05-132540
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.19.0-0.nightly-2025-01-02-160414
OCP_VERSION := 4.19.0-0.nightly-2025-01-05-132538
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.19.0-0.nightly-arm64-2025-01-02-210017"
"base": "4.19.0-0.nightly-arm64-2025-01-05-132540"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4ecfae89c530c3bc40085299a973fea1d8ec7e237212d7a7296f455ba852b478",
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.19.0-0.nightly-2025-01-02-160414"
"base": "4.19.0-0.nightly-2025-01-05-132538"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1ba87d15e49bf4b0ec404e0ad6c2ee4f2c20cfc2bdd5fb725136a157dc2ad2f1",
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.19.0-0.nightly-arm64-2025-01-02-210017"
"base": "4.19.0-0.nightly-arm64-2025-01-05-132540"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5198dd1e09caa1ffa728636b52582cb4decca2211815ce16412ea59395f2fc30",
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.19.0-0.nightly-2025-01-02-160414"
"base": "4.19.0-0.nightly-2025-01-05-132538"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cd702a31c36add2ac295d1719a90325ebca8108df2a85ef37a00dc2d54e8ad04",
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.19.0-0.nightly-arm64-2025-01-02-210017"
"base": "4.19.0-0.nightly-arm64-2025-01-05-132540"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:50f1aa40a784505aa06d99ba8550b947b2a6f948675e46c4d8d7e0e41131c390",
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.19.0-0.nightly-2025-01-02-160414"
"base": "4.19.0-0.nightly-2025-01-05-132538"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:36cd18d28cc0b664aa2dbfa3c08e0b69a240642f5d1c3c7021670e8a1e11c75a",
Expand Down
15 changes: 10 additions & 5 deletions scripts/auto-rebase/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
- cluster-openshift-controller-manager-operator embedded-component 0b04b66c041c19abc6a04a31fc5b2688249eb0de to 91369d1d6c1e6196425c2f8742068c03bda1457d
- 56ce916 2024-12-20T18:10:05+05:30 NO-JIRA: Add team members to the OWNERS file

- openshift-controller-manager embedded-component 3ebe2f4f3900d6a3748ef0faf3535f635dbf7d11 to 29531eafbff8b466bbee6a02c345f43245053482
- cd0d0ac 2024-12-20T17:59:30+05:30 NO-JIRA: Add team members to the OWNERS file
- api embedded-component 188620a9ab5eaad36199cf83d9a0afcb08fdfd52 to d6d8306a24ec146d7e8cb7bdc1259a2144dc77a0
- 640d2bf8 2024-12-20T12:31:10-05:00 MachineOSBuild: relax CEL for conditions
- 09629e5e 2024-12-19T11:13:54-05:00 Readd removed NodeDisruptionPolicy tests
- 065faacf 2024-12-19T11:13:51-05:00 Further MOSC/MOSB updates
- 2ac96767 2024-12-13T10:08:23-05:00 Additional MOSC/MOSB updates
- 9e7c2320 2024-12-13T10:08:23-05:00 Additional fixes for MOSC/MOSB
- 360f44c8 2024-12-13T10:08:23-05:00 Update godoc and validation for MOSC/MOSB
- 09dad20f 2024-12-13T10:08:23-05:00 Temporarily exclude v1 MOSC/MOSB from payload
- 5beb7826 2024-12-13T10:08:23-05:00 Add v1 versions of OnClusterBuild APIs
- 61de3ec9 2024-12-13T10:08:21-05:00 MachineOSConfig: set ImageSecretObjectReference to optional

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
@@ -1,4 +1,4 @@
https://github.com/openshift/api embedded-component 188620a9ab5eaad36199cf83d9a0afcb08fdfd52
https://github.com/openshift/api embedded-component d6d8306a24ec146d7e8cb7bdc1259a2144dc77a0
https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component 9dceffb866318acb2bb77182095a18b6f397416f
https://github.com/openshift/cluster-dns-operator embedded-component 0a9deeea4c335e259747b35267811a4a040289fd
https://github.com/openshift/cluster-ingress-operator embedded-component dbdff16b1173dd3992e5be42203e8afbae1cb06f
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.19.0-0.nightly-2025-01-02-160414" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.19.0-0.nightly-arm64-2025-01-02-210017"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.19.0-0.nightly-2025-01-05-132538" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.19.0-0.nightly-arm64-2025-01-05-132540"