From f745568e61feea8ac8c56c0288b0db9417bf51d2 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 17 Jul 2024 04:12:32 +0000 Subject: [PATCH 1/4] update last_rebase.sh --- scripts/auto-rebase/last_rebase.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index d3d2948977..5ffc290856 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.15.0-0.nightly-2024-07-14-093612" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.15.0-0.nightly-arm64-2024-07-14-235456" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.15.0-0.nightly-2024-07-16-073749" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.15.0-0.nightly-arm64-2024-07-16-065722" From 6e796b0d88d20d06121ba58b51ae58a8773d2b40 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 17 Jul 2024 04:12:32 +0000 Subject: [PATCH 2/4] update changelog --- scripts/auto-rebase/changelog.txt | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 855b64a1f0..e69de29bb2 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,25 +0,0 @@ -- cluster-ingress-operator embedded-component 28bcd5f6f2ce8496e1967860ee5646f0f5c373b3 to 0928822bf67774af6798b218bff54ff5d14594cd - - 357c1a7 2024-07-02T20:23:53-04:00 Delete & recreate canary route to clear spec.host - - a1d3934 2024-07-02T20:23:53-04:00 Allow operator to update Route spec.subdomain - -- machine-config-operator embedded-component e45c36964262382c4d320317ea3efe0cca56dce4 to cee5dd7922f666583d92128b72fe7adac77c04ae - - 11e8f78d 2024-06-10T13:47:43+00:00 OCPBUGS-33357: Check both ready and health ingress endpoints - - a2db2f2f 2024-03-04T17:15:20+01:00 OCPBUGS-22324: Fix wait-for-br-ex-up enablement logic - - acf9f5d0 2024-03-04T17:15:19+01:00 Wait for br-ex up event before node-valid-hostname - - 2e12a64a 2024-03-04T17:15:18+01:00 OCPBUGS-27162: Add dependency on crio-wipe to resolv-prepender - - 4efd96aa 2024-03-04T17:15:17+01:00 OCPBUGS-29732: Always touch resolv-prepender file at end of script - - cb26598a 2024-03-04T17:15:16+01:00 OPNET-469: Apply new DNS configuration only if changed - - 0740a606 2024-03-04T17:15:15+01:00 OCPBUGS-29624: Restart resolv-prepender on failure - - d7d1c96b 2024-03-04T17:15:14+01:00 OPNET-355: Use NM's dns-change event for resolv.conf - -- operator-framework-olm embedded-component 89cf3705e28c59cc9228f606de8b555771eb474a to 28befe20a9f97db2a4a47c655b483de3197622da - - 1849397f 2024-07-10T10:16:43-04:00 [OCPBUGS-25341]: perform operator apiService certificate validity checks directly (#3217) - - 8c4e7516 2024-07-02T10:50:25-07:00 Unpack Job Creation Failure Test (#3297) - - 2069e356 2024-07-02T10:50:25-07:00 Fix: Ensure jobs without unpack label are considered (#3262) - -- oc image-amd64 44edfb50c55756395abc844fc4f7edb19dfefa50 to 1e41aa3e007fc60af9edfc77be1c610205943f4a - - f976e195 2024-07-05T15:01:09+01:00 debug: set required-scc annotation to privileged for node debug pods - -- oc image-arm64 44edfb50c55756395abc844fc4f7edb19dfefa50 to 1e41aa3e007fc60af9edfc77be1c610205943f4a - - f976e195 2024-07-05T15:01:09+01:00 debug: set required-scc annotation to privileged for node debug pods - From 8b56f759b5d3f0476f970c94503b5299fed22b62 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 17 Jul 2024 04:13:13 +0000 Subject: [PATCH 3/4] update manifests --- .../operator-lifecycle-manager/release-olm-aarch64.json | 2 +- .../optional/operator-lifecycle-manager/release-olm-x86_64.json | 2 +- assets/release/release-aarch64.json | 2 +- assets/release/release-x86_64.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json index b4bdbb068b..f4d9f412d4 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.15.0-0.nightly-arm64-2024-07-14-235456" + "base": "4.15.0-0.nightly-arm64-2024-07-16-065722" }, "images": { "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c873743346f1f8c4da05c3a01d34f2c7c123949ae27467bd18a7d60afe998b67", 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 e78e34d469..2245aa8a7f 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.15.0-0.nightly-2024-07-14-093612" + "base": "4.15.0-0.nightly-2024-07-16-073749" }, "images": { "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3f69c1fba79e6e413e299560a0d82347b545788efb620ededf90639ae0671054", diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 81c0b1edcf..bfd2fa0c1f 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.15.0-0.nightly-arm64-2024-07-14-235456" + "base": "4.15.0-0.nightly-arm64-2024-07-16-065722" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5a6c7447aea28bc530d5688e0b61bffa3ab626f10f850fef7a495ddd6583047e", diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 613c1db68f..dd325d124c 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.15.0-0.nightly-2024-07-14-093612" + "base": "4.15.0-0.nightly-2024-07-16-073749" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c7b6e2497941cc22e6539224697c1e99eaa012d3dcdc96456800dd89f470bd86", From 4a90478ac39c37bf123066e27e15852ea2a7fa43 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 17 Jul 2024 04:13:19 +0000 Subject: [PATCH 4/4] update buildfiles --- Makefile.version.aarch64.var | 2 +- Makefile.version.x86_64.var | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index 9df16861f0..4c64848a96 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.15.0-0.nightly-arm64-2024-07-14-235456 +OCP_VERSION := 4.15.0-0.nightly-arm64-2024-07-16-065722 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index 975929bb87..f428d865e1 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.15.0-0.nightly-2024-07-14-093612 +OCP_VERSION := 4.15.0-0.nightly-2024-07-16-073749