diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index ebc35bdaf2..8e76041a0f 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.14.0-0.nightly-arm64-2024-06-14-162956 +OCP_VERSION := 4.14.0-0.nightly-arm64-2024-06-17-112429 diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index efa49a7dca..d772393ec2 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.14.0-0.nightly-arm64-2024-06-14-162956" + "base": "4.14.0-0.nightly-arm64-2024-06-17-112429" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:292a5b39838be626fea52c0179a2dc41e76d58447f3b18d62f3f2f5f30549325", diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 0433bb1c65..e69de29bb2 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,17 +0,0 @@ -- cluster-ingress-operator embedded-component c6fc4df40f69091e864054bc79a88733e7af00fe to fe438b86e3241ffdb13e7a4cbac43060949733cc - - 11b9f25 2024-06-12T19:26:47-04:00 copyProbe: Refactor to group copying of defaults - - a2f0d48 2024-06-12T19:26:47-04:00 Specify parameter values for router probes - - 3b16a4c 2024-06-12T19:26:47-04:00 Specify default mode on configmap/secret volumes - - ca387ca 2024-06-12T19:26:47-04:00 Set "service-ca-bundle" volume's default mode - - c941a98 2024-06-12T13:10:47-04:00 TestHostNetworkPortBinding: Check service ports - - 10c4f90 2024-06-12T13:10:47-04:00 TestHostNetworkPortBinding: Use t.Log, t.Cleanup - - cf11716 2024-06-12T13:10:47-04:00 Test_desiredInternalIngressControllerService: godoc - - 3287e82 2024-06-12T13:10:47-04:00 Test_desiredLoadBalancerService: Add assertions - - d5c9e98 2024-06-12T13:10:47-04:00 Set SessionAffinity to avoid confusing diffs - - fd0c3df 2024-06-12T13:10:47-04:00 crdChanged, nodePortServiceChanged: Fix preserves - - 4eed6b0 2024-06-12T13:10:47-04:00 Test_*Changed: Verify that some update was made - - 71cf9ec 2024-06-12T13:10:47-04:00 internalServiceChanged: Fix target port logic - -- oc image-arm64 f7b14a92857ad1f28be2e2eaec3ae8229d4c2761 to aa6e2f22f0c7e46757d976b6eb003786196ff907 - - d0be9d13 2024-06-13T13:33:41-05:00 bump go-git to v5.11.0 - diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index 2a2315a603..0213e3f99b 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-06-14-081235" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2024-06-14-162956" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.14.0-0.nightly-2024-06-14-081235" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2024-06-17-112429"