From 9588ab3de2a1bc5e8fba5a86d76694a743a14a0e Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 23 Jul 2024 04:21:03 +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 f15c244158..7e8b7c3368 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.17.0-0.nightly-2024-07-20-191204" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2024-07-21-222932" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.17.0-0.nightly-2024-07-20-191204" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2024-07-22-172231" From f2bd0d7d3902435bd5a50ba37d1bce5cf6e2574f Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 23 Jul 2024 04:21:03 +0000 Subject: [PATCH 2/4] update changelog --- scripts/auto-rebase/changelog.txt | 37 ------------------------------- 1 file changed, 37 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index f4af81fb28..e69de29bb2 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,37 +0,0 @@ -- api embedded-component e9f09d21bcb566954b1c28ba242887ae93979436 to 8da8de571496f968c1ce283e51718f218cc9eedc - - 34cb805 2024-07-16T15:33:44-04:00 Drop ImagePolicy featuregate - - d68bab0 2024-07-16T15:33:44-04:00 SigstoreImageVerification feature gatemarker for the ClusterImagePolicy and ImagePolicy - -- csi-external-snapshotter embedded-component a58f2cd35a2623d83179e9558a04a3094c694f4b to 6ae55b8749a2fd9011d2c75d5f428f36e93be512 - - 5af999d 2024-07-12T19:32:34+00:00 UPSTREAM: : Updating ose-csi-snapshot-controller-container image to be consistent with ART for 4.17 Reconciling with https://github.com/openshift/ocp-build-data/tree/81a28f96d18bca14030c8f73664a9c230858fb03/images/ose-csi-snapshot-controller.yml - - 70b4688 2024-07-12T19:02:23+00:00 UPSTREAM: : Updating ose-csi-snapshot-validation-webhook-container image to be consistent with ART for 4.17 Reconciling with https://github.com/openshift/ocp-build-data/tree/81a28f96d18bca14030c8f73664a9c230858fb03/images/csi-snapshot-validation-webhook.yml - -- kubernetes embedded-component e34cf927edb7321aac8e69ac9b8849fb831a8cfe to 1bead22a2ef091d421bbe4e455799fac869c3c80 - - a1eaa95fe 2024-07-15T16:39:34-03:00 UPSTREAM: : add tool to validate test packages imported - - 092eb800a 2024-07-11T12:53:19+02:00 UPSTREAM: : sync imports and update test rules - -- machine-config-operator embedded-component 6968535ff182ae863a5309558239df879359b8d6 to 5fbf0e517a5bedfffe78247ce5ec65712521a3b4 - - 43db0a10 2024-07-16T12:12:31-05:00 Restore setup-envtest used in the verify test - -- oc image-amd64 1127650882a9e42d059dca74c21915155afaeb2e to 4cd37cabf60e395d182361aef42ee0300c8233f6 - - 4cd37cab 2024-07-18T21:43:33+00:00 upgarde status: use a table to represent node pools (#1821) - -- csi-external-snapshotter image-amd64 a58f2cd35a2623d83179e9558a04a3094c694f4b to 6ae55b8749a2fd9011d2c75d5f428f36e93be512 - - 5af999d 2024-07-12T19:32:34+00:00 UPSTREAM: : Updating ose-csi-snapshot-controller-container image to be consistent with ART for 4.17 Reconciling with https://github.com/openshift/ocp-build-data/tree/81a28f96d18bca14030c8f73664a9c230858fb03/images/ose-csi-snapshot-controller.yml - - 70b4688 2024-07-12T19:02:23+00:00 UPSTREAM: : Updating ose-csi-snapshot-validation-webhook-container image to be consistent with ART for 4.17 Reconciling with https://github.com/openshift/ocp-build-data/tree/81a28f96d18bca14030c8f73664a9c230858fb03/images/csi-snapshot-validation-webhook.yml - -- csi-external-snapshotter image-amd64 a58f2cd35a2623d83179e9558a04a3094c694f4b to 6ae55b8749a2fd9011d2c75d5f428f36e93be512 - - 5af999d 2024-07-12T19:32:34+00:00 UPSTREAM: : Updating ose-csi-snapshot-controller-container image to be consistent with ART for 4.17 Reconciling with https://github.com/openshift/ocp-build-data/tree/81a28f96d18bca14030c8f73664a9c230858fb03/images/ose-csi-snapshot-controller.yml - - 70b4688 2024-07-12T19:02:23+00:00 UPSTREAM: : Updating ose-csi-snapshot-validation-webhook-container image to be consistent with ART for 4.17 Reconciling with https://github.com/openshift/ocp-build-data/tree/81a28f96d18bca14030c8f73664a9c230858fb03/images/csi-snapshot-validation-webhook.yml - -- csi-external-snapshotter image-amd64 a58f2cd35a2623d83179e9558a04a3094c694f4b to 6ae55b8749a2fd9011d2c75d5f428f36e93be512 - - 5af999d 2024-07-12T19:32:34+00:00 UPSTREAM: : Updating ose-csi-snapshot-controller-container image to be consistent with ART for 4.17 Reconciling with https://github.com/openshift/ocp-build-data/tree/81a28f96d18bca14030c8f73664a9c230858fb03/images/ose-csi-snapshot-controller.yml - - 70b4688 2024-07-12T19:02:23+00:00 UPSTREAM: : Updating ose-csi-snapshot-validation-webhook-container image to be consistent with ART for 4.17 Reconciling with https://github.com/openshift/ocp-build-data/tree/81a28f96d18bca14030c8f73664a9c230858fb03/images/csi-snapshot-validation-webhook.yml - -- kubernetes image-amd64 e34cf927edb7321aac8e69ac9b8849fb831a8cfe to 1bead22a2ef091d421bbe4e455799fac869c3c80 - - a1eaa95fe 2024-07-15T16:39:34-03:00 UPSTREAM: : add tool to validate test packages imported - - 092eb800a 2024-07-11T12:53:19+02:00 UPSTREAM: : sync imports and update test rules - -- oc image-arm64 1127650882a9e42d059dca74c21915155afaeb2e to 4cd37cabf60e395d182361aef42ee0300c8233f6 - - 4cd37cab 2024-07-18T21:43:33+00:00 upgarde status: use a table to represent node pools (#1821) - From 455ab30fbfaef02335ed17632d96365f815a4ec9 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 23 Jul 2024 04:21:34 +0000 Subject: [PATCH 3/4] update manifests --- assets/optional/multus/release-multus-aarch64.json | 2 +- .../operator-lifecycle-manager/release-olm-aarch64.json | 2 +- assets/release/release-aarch64.json | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/assets/optional/multus/release-multus-aarch64.json b/assets/optional/multus/release-multus-aarch64.json index ddac632d4a..e3f38ee97b 100644 --- a/assets/optional/multus/release-multus-aarch64.json +++ b/assets/optional/multus/release-multus-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.17.0-0.nightly-arm64-2024-07-21-222932" + "base": "4.17.0-0.nightly-arm64-2024-07-22-172231" }, "images": { "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8b9f3ed107b736e87a74b8f9f2d9c98ef022f4e599ba1475a10816c00b528a81", diff --git a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json index 3ca96ffbf4..70faf09749 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.17.0-0.nightly-arm64-2024-07-21-222932" + "base": "4.17.0-0.nightly-arm64-2024-07-22-172231" }, "images": { "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:35db4a46560ab61702891aad9c8905cef0b389fa3f7561537e7b76b85c4c7c06", diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index fd7e7769d1..042f6c0acb 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,11 +1,11 @@ { "release": { - "base": "4.17.0-0.nightly-arm64-2024-07-21-222932" + "base": "4.17.0-0.nightly-arm64-2024-07-22-172231" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f6b0c1543790f5f4223a7f487e7b00607dcbe502414116c2b530700e48f8f15e", "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3db6babc1a28c99574b0f606fc3035d694ff68859581352356335c7a89481c4e", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:659ca58144cdf5a0a3b0d2e5d1c4c1a4b2a3ebbeb9c8c9364943504a658f4fc8", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:31f9d0fb53a9a11f789bcbce164e85652034df7447123f9b84287b6bc1a74fef", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0e0d2b4b07dd3f2ea4171e30838036f76f81c53a6264056ad8152355765d3872", "openssl": "registry.redhat.io/ubi9@sha256:ed84f34cd929ea6b0c247b6daef54dd79602804a32480a052951021caf429494", "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:56d3a1e014dc92149acf5beee82933c9914c87563ee98f26936e601975957455", From 69b46dc75c4cd0ff84d33c94dc3f617949702d1c Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 23 Jul 2024 04:21:35 +0000 Subject: [PATCH 4/4] update buildfiles --- Makefile.version.aarch64.var | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index 059b4efa5c..c344daaa9b 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.17.0-0.nightly-arm64-2024-07-21-222932 +OCP_VERSION := 4.17.0-0.nightly-arm64-2024-07-22-172231