From b173df874991b477bacfe2d3920a8929f542dd7a Mon Sep 17 00:00:00 2001 From: ci-robot Date: Fri, 10 May 2024 05:07:52 +0000 Subject: [PATCH 1/5] 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 49fd4f1392..9bec00830e 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.14.0-0.nightly-2024-05-08-232852" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2024-05-09-000637" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.14.0-0.nightly-2024-05-08-232852" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2024-05-09-233233" From be98d834a9c54de4de7bcdd3473e36b859d6e6fb Mon Sep 17 00:00:00 2001 From: ci-robot Date: Fri, 10 May 2024 05:07:52 +0000 Subject: [PATCH 2/5] update changelog --- scripts/auto-rebase/changelog.txt | 3 +++ scripts/auto-rebase/commits.txt | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index e69de29bb2..5f80e0c711 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -0,0 +1,3 @@ +- router image-arm64 e1e59b3337700e2b94c8d5c5e5414519f9785614 to e17abdff0095edee65e3be926f98b758aa3c87bb + - f0ad69e 2024-05-08T07:45:09+00:00 OCPBUGS-29690: Count active services before setting weight to 1 + diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 2c2b3fca0b..ee25c5d5de 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -30,7 +30,7 @@ https://github.com/openshift/coredns image-arm64 7d3fa777871ed2e5a70715e7f3e71d3 https://github.com/openshift/csi-external-snapshotter image-arm64 a6834536936b16dcd9ee81a8753a2ef6dc208541 https://github.com/openshift/csi-external-snapshotter image-arm64 a6834536936b16dcd9ee81a8753a2ef6dc208541 https://github.com/openshift/csi-external-snapshotter image-arm64 a6834536936b16dcd9ee81a8753a2ef6dc208541 -https://github.com/openshift/router image-arm64 e1e59b3337700e2b94c8d5c5e5414519f9785614 +https://github.com/openshift/router image-arm64 e17abdff0095edee65e3be926f98b758aa3c87bb https://github.com/openshift/kube-rbac-proxy image-arm64 1a646b98d8864e53accb726531d86f084ab13977 https://github.com/openshift/ovn-kubernetes image-arm64 255b35826c736426a2f39ea1bbc72adeb19cf1e6 https://github.com/openshift/kubernetes image-arm64 fd36fb9acf9a99270f4fca3f5817fd52c8bc58b4 From b0ad496bbf69c0db03091448bb12a5b0b9564000 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Fri, 10 May 2024 05:08:24 +0000 Subject: [PATCH 3/5] update component images --- packaging/crio.conf.d/microshift_arm64.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/crio.conf.d/microshift_arm64.conf b/packaging/crio.conf.d/microshift_arm64.conf index bd334ee0f9..b2f8d7547e 100644 --- a/packaging/crio.conf.d/microshift_arm64.conf +++ b/packaging/crio.conf.d/microshift_arm64.conf @@ -25,6 +25,6 @@ plugin_dirs = [ # for community builds on top of OKD, this setting has no effect [crio.image] global_auth_file="/etc/crio/openshift-pull-secret" -pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9542b4d7a6a0431167574efaa4a64520ac0b2d21fb6f6693a307c53bf8036982" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b4efd6f159326c742f4854a2ce52b3983ac58b6ef9861345fa8852a92f8499df" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" From b3c2fc5c5dccc0cda566f8e7740c568db68c4973 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Fri, 10 May 2024 05:08:25 +0000 Subject: [PATCH 4/5] update manifests --- assets/release/release-aarch64.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index f941182537..502ad6de04 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,23 +1,23 @@ { "release": { - "base": "4.14.0-0.nightly-arm64-2024-05-09-000637" + "base": "4.14.0-0.nightly-arm64-2024-05-09-233233" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5cc92ef6ae3d99adeb12014bf4cbb4860cdf07d716b49ae9b4a1ea07c379502e", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d1a0dc42459ebbda1cb51f7e54687f307f8e5a2b95fde17a7620ac5b2823f128", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cab2788b7f619cbed7538b4e264ede24ac10db45f7ed8a6058f0544504bf093f", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dae580301abc5601ce76c41095f47b287abf2a3b8d6bf8d56ff19d5b976d42b4", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ffef47121cd690f3b2016cb94af8b2014aac50cc378cfdab9e27591c621288b3", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bf1dbdaecb113ca7da070787b624df2d4047e431ffb9f9a20960e26c0bc059cb", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:406f0b4cbe70650684dc44eaf39c12e6985e7c54cc4004d24efcb323f4887e66", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2fff86d25e63f96eee91431a583a26cb82a811503f8b0d96815d588bb8417042", "openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671", "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:42d8165730e24e6a4b120cee0567eb724d34e2ec4eaa1070a8ad80eb779c474f", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9542b4d7a6a0431167574efaa4a64520ac0b2d21fb6f6693a307c53bf8036982", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c50130f765bdf0e397a6b8d52e396b7847adf4f62dab0bef5af8649d8b870e08", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b4efd6f159326c742f4854a2ce52b3983ac58b6ef9861345fa8852a92f8499df", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8c10dc91646e61dfb0c3222f39184bdaf7b2375a5190cd83782366b2cd8a1379", "topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel9@sha256:d0c039eba8157965b0a7971ad4e01576d2c1e31b09fe938554163b324cc4dc73", "topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:caa0bbab808d8cbed476e8fa3e296ceb90f8d7d253e36588fa77e639ea389d55", "topolvm_csi_livenessprobe": "registry.redhat.io/openshift4/ose-csi-livenessprobe@sha256:829a8e4d34404abbd22fddb6ebfa0f74daa55f2697fb147da77b83fc8b473d8c", "topolvm_csi_resizer": "registry.redhat.io/openshift4/ose-csi-external-resizer@sha256:7ee0257998b7f804fcde9c095b4dc240c510eb316d7223e8485f701b5c9f2fbf", "topolvm_csi_provisioner": "registry.redhat.io/openshift4/ose-csi-external-provisioner@sha256:b453a5c76ba4e975a978e31a51531b1d6233723b0d944622caf7844dedf9ad5a", - "csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4bb49330820af1b42a2314fac03199c3b3852c380d2c0b14cae6c2fdec90a3d6", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c8de1146192a9dca451c14a0f9e2483519f6ad5f4392b762163c5806d7024fcb", - "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c0b836edc0d2ded4e7abc8be0f43ab8c06d7d1aadf35d02d7181dce3fde9715e" + "csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d4f91117d557baa433da7b80be16d2956c6414012a034a5631ecab737995c828", + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:415341fcda63e92e1abb4c5f80e077beb899fbf113e20fa4a43fd51387aea245", + "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:53bc14e163a920b5609febb3f87efd84adef3e89ff40d633ed3ea261b2016642" } } From e4bc69108f5cd98f2198dbce0bfa7d4234f3cdaf Mon Sep 17 00:00:00 2001 From: ci-robot Date: Fri, 10 May 2024 05:08:39 +0000 Subject: [PATCH 5/5] 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 581257a85a..22b42998fd 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.14.0-0.nightly-arm64-2024-05-09-000637 +OCP_VERSION := 4.14.0-0.nightly-arm64-2024-05-09-233233