From 91ab0f7376d6357b10453676437818ed735cd91d Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 23 May 2023 05:10:56 +0000 Subject: [PATCH 1/3] 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 0048d6ff90..77fed34a77 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.12.0-0.nightly-2023-05-22-001909" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.12.0-0.nightly-arm64-2023-05-22-001909" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.12.0-0.nightly-2023-05-22-125228" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.12.0-0.nightly-arm64-2023-05-23-015257" From dc65fa4dd61069e1e78f21ee6867d49d272ee524 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 23 May 2023 05:10:56 +0000 Subject: [PATCH 2/3] update changelog --- scripts/auto-rebase/changelog.txt | 6 ++---- scripts/auto-rebase/commits.txt | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 1bcbd01c00..4ea7b602af 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,4 +1,2 @@ -# ovn-kubernetes image-amd64 401c3ae3508d24dccb5fce60cf903d1718f90832 to ce142ecac5f04888793667e87304591a0dcffb5b -1c944ac98621a8b4bc3054070f435cd863929c17 2023-05-15T10:32:47+02:00 Call SyncEndpoints from AddService -# ovn-kubernetes image-arm64 401c3ae3508d24dccb5fce60cf903d1718f90832 to ce142ecac5f04888793667e87304591a0dcffb5b -1c944ac98621a8b4bc3054070f435cd863929c17 2023-05-15T10:32:47+02:00 Call SyncEndpoints from AddService +# csi-livenessprobe image-arm64 720e1d6e3e828dec9908091da9f5d80a31d75585 to 9cb056421c5a2e37435dbedbd7d73de8db1e094a +bf20fae2da2649756ea3a638a7d43c23d2e29be4 2023-05-18T16:51:39-07:00 OCPBUGS-13821: Bump gRPC from 1.38.0 to 1.49.0 diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 0784bae3ce..395c448094 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -27,7 +27,7 @@ https://github.com/openshift/oc image-arm64 31aa3e89a926f81aa0af30320ffcb71acadf https://github.com/openshift/coredns image-arm64 9aaa7e0a86b69bafb9f544a0e5cb1873535a8f6b https://github.com/openshift/csi-external-provisioner image-arm64 140851f6c0e70cf917b3361808b31628c68ea8a5 https://github.com/openshift/csi-external-resizer image-arm64 239d751f51743214417dd5058645c2c1d390d1b5 -https://github.com/openshift/csi-livenessprobe image-arm64 720e1d6e3e828dec9908091da9f5d80a31d75585 +https://github.com/openshift/csi-livenessprobe image-arm64 9cb056421c5a2e37435dbedbd7d73de8db1e094a https://github.com/openshift/csi-node-driver-registrar image-arm64 805d5ac247137b02e6081e3eb7aa1fb9f4c7b4b2 https://github.com/openshift/router image-arm64 3065f6583f3925328fbdbfe95e3bc7bb7a084d33 https://github.com/openshift/kube-rbac-proxy image-arm64 94f3fde785a22afdc77768f5c346c7d3195274d2 From 9f3a35dfba075a05d24c1ff90191573d4b0ab3cc Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 23 May 2023 05:11:57 +0000 Subject: [PATCH 3/3] update manifests --- assets/release/release-aarch64.json | 4 ++-- assets/release/release-x86_64.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index dac11e5fed..fa97ac0132 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.12.0-0.nightly-arm64-2023-05-22-001909" + "base": "4.12.0-0.nightly-arm64-2023-05-23-015257" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c30ab6f34cb327d28dcca7fad4b1d1d9281ff1296aa4a63f957239c6e4fceeb3", @@ -12,7 +12,7 @@ "csi-external-provisioner": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:11b7127104153c0e70369d13e796a93570ab2c8db143f152fc72900254cea0d7", "csi-external-resizer": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:42d91b64873fba1da92f6a694235c612b070d11494833a7d90fb150e6172b6e5", "csi-node-driver-registrar": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9ee678922fa589c82ce577ffabf77756dd29e6505992f539960bf7f3e0df09d1", - "csi-livenessprobe": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:63829b06638d884ac6338e9b7c6d570138fdce9eff0e177734ed1641387ac9c8", + "csi-livenessprobe": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0ce7e4869cd8a8389c5de0556a75c487b74b0135113cb51976eb5f3e82f8bf23", "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5ff2110b1f09f187ae186d14f2db91691e40e0452b6a966ee635acd7f4492640", "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:62caed97026a5782e6887bfe59b2efce8096667a0047006fcc59411890841749", "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a9c16b90b14db5c12787fba494b12bb3cb246e68bd86af46f6a48514bfd42d44" diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 7827d2995b..c7255489d8 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.12.0-0.nightly-2023-05-22-001909" + "base": "4.12.0-0.nightly-2023-05-22-125228" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b45d4cac21969d8200908b9a97338c9923e8a07f843b084849791f11ffb8926c",