From b1a54e7bf9052dc8c595c59efac37d54199c0040 Mon Sep 17 00:00:00 2001 From: "microshift-rebase-script[bot]" <114237296+microshift-rebase-script[bot]@users.noreply.github.com> Date: Mon, 6 Jan 2025 06:14:48 +0000 Subject: [PATCH] NO-ISSUE: rebase-main-4.19.0-0.nightly-2025-01-05-132538_amd64-2025-01-05_arm64-2025-01-05 (#4384) * update last_rebase.sh * update changelog * update manifests * update buildfiles --------- Co-authored-by: ci-robot --- Makefile.version.aarch64.var | 2 +- Makefile.version.x86_64.var | 2 +- .../optional/multus/release-multus-aarch64.json | 2 +- assets/optional/multus/release-multus-x86_64.json | 2 +- .../release-olm-aarch64.json | 2 +- .../release-olm-x86_64.json | 2 +- assets/release/release-aarch64.json | 2 +- assets/release/release-x86_64.json | 2 +- scripts/auto-rebase/changelog.txt | 15 ++++++++++----- scripts/auto-rebase/commits.txt | 2 +- scripts/auto-rebase/last_rebase.sh | 2 +- 11 files changed, 20 insertions(+), 15 deletions(-) diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index 55a4ddea661..ed6c372953b 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -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 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index a3c5513aa8a..fe1a1785f03 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.19.0-0.nightly-2025-01-02-160414 +OCP_VERSION := 4.19.0-0.nightly-2025-01-05-132538 diff --git a/assets/optional/multus/release-multus-aarch64.json b/assets/optional/multus/release-multus-aarch64.json index eced4d95384..bbffa12a206 100644 --- a/assets/optional/multus/release-multus-aarch64.json +++ b/assets/optional/multus/release-multus-aarch64.json @@ -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", diff --git a/assets/optional/multus/release-multus-x86_64.json b/assets/optional/multus/release-multus-x86_64.json index 779837e38b7..e830d8503a2 100644 --- a/assets/optional/multus/release-multus-x86_64.json +++ b/assets/optional/multus/release-multus-x86_64.json @@ -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", diff --git a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json index 30e388b5495..074b0e4e6eb 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json @@ -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", diff --git a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json index b9922bb1a36..f13ce2e21b4 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json @@ -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", diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index a5844aaa461..f5c2644ac03 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -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", diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 8e00e9c4dab..8df481aa769 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -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", diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 0d57a15e27e..0579b41100b 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -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 diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 8b9b2065cec..2ad417c84ab 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -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 diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index a90d574c28f..6659e8e13cb 100755 --- a/scripts/auto-rebase/last_rebase.sh +++ b/scripts/auto-rebase/last_rebase.sh @@ -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"