From d8fa64e0bda7c045a13526c279bc069076c634e0 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 25 Jul 2024 04:07:31 +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 8473f6e528..761112cfc1 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-23-185402" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.15.0-0.nightly-arm64-2024-07-23-233254" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.15.0-0.nightly-2024-07-24-150754" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.15.0-0.nightly-arm64-2024-07-24-220718" From 4fdff5939712843cdc561d8b8a55d756ead83248 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 25 Jul 2024 04:07:31 +0000 Subject: [PATCH 2/4] update changelog --- scripts/auto-rebase/changelog.txt | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 252aaaab5c..e69de29bb2 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,10 +0,0 @@ -- operator-framework-olm embedded-component 28befe20a9f97db2a4a47c655b483de3197622da to f3f8de5d0caa7387630272260e9e4e0db1b8ef85 - - f3c75774 2024-07-17T10:46:15+02:00 [CARRY] Bump github.com/containers/image/v5 - - ea327068 2024-07-10T13:11:33+00:00 fix sorting unpack jobs (#3299) - -- coredns image-amd64 22f950eae53fcba187c2303ac4f1a8305b6c1c8a to 1326282c9e158078634be4261b75ded247d233d7 - - f70cdab 2024-07-16T18:18:10+00:00 UPSTREAM: 6354: openshift: Fix OCPBUGS-15755 - -- coredns image-arm64 22f950eae53fcba187c2303ac4f1a8305b6c1c8a to 1326282c9e158078634be4261b75ded247d233d7 - - f70cdab 2024-07-16T18:18:10+00:00 UPSTREAM: 6354: openshift: Fix OCPBUGS-15755 - From 5e219b5653d404676e51347d111c4730672c55ad Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 25 Jul 2024 04:08:07 +0000 Subject: [PATCH 3/4] update manifests --- .../operator-lifecycle-manager/release-olm-aarch64.json | 2 +- .../operator-lifecycle-manager/release-olm-x86_64.json | 2 +- assets/release/release-aarch64.json | 2 +- assets/release/release-x86_64.json | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json index 53cfa87a04..5f886ca534 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-23-233254" + "base": "4.15.0-0.nightly-arm64-2024-07-24-220718" }, "images": { "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3952ada86beaa57743331b8014beadac751ce1e4b3499f65b6bff20f0d2215fe", 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 b1302c0367..b7e1ad8d98 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-23-185402" + "base": "4.15.0-0.nightly-2024-07-24-150754" }, "images": { "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:567991b15bc4615590916c428aa9d1d835f4f076c5fd268eacb6cebddb17d925", diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 328e038eb6..10b918e4a3 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-23-233254" + "base": "4.15.0-0.nightly-arm64-2024-07-24-220718" }, "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 e5642f53f0..0bd616f19c 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,11 +1,11 @@ { "release": { - "base": "4.15.0-0.nightly-2024-07-23-185402" + "base": "4.15.0-0.nightly-2024-07-24-150754" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c7b6e2497941cc22e6539224697c1e99eaa012d3dcdc96456800dd89f470bd86", "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1d96a087eac8c22a30b2b39478d248f6404855e794762329539aabfb46eaeb80", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b3d68f7a4936f8dfaa97c1b6e38d454d822fbfca0048df643db13c84653b359b", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:acf3e277707191e82811a1d4b139db21d779a21bdf093ca8961b47e9227f5031", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0bf40df05a3599b6ef8706e78bb1914b9f988946543a685449110aaf8b59e8bc", "openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671", "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f0f588d66a295ad5c07bfc8e591cae68661beab2612f0f0300d800e10e9647a0", From 4d157f9443aa4a931dad555d4ae64aefdfd57f6b Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 25 Jul 2024 04:08:09 +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 f173359f2a..0f5ef75f9d 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.15.0-0.nightly-arm64-2024-07-23-233254 +OCP_VERSION := 4.15.0-0.nightly-arm64-2024-07-24-220718 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index 9395959ed1..0c9441accb 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.15.0-0.nightly-2024-07-23-185402 +OCP_VERSION := 4.15.0-0.nightly-2024-07-24-150754