From fdadf9c3c94f1d9a34aaaca05b8cd04a0a3f1418 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 3 Apr 2024 05:07:24 +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 42b50c37cf..f52841e252 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-03-29-144548" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.15.0-0.nightly-arm64-2024-04-01-233611" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.15.0-0.nightly-2024-04-02-181803" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.15.0-0.nightly-arm64-2024-04-02-150630" From a624e965f86dfcc98dadb8a650cb9d2d949f52b7 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 3 Apr 2024 05:08:06 +0000 Subject: [PATCH 2/3] update manifests --- .../operator-lifecycle-manager/release-olm-aarch64.json | 2 +- .../optional/operator-lifecycle-manager/release-olm-x86_64.json | 2 +- assets/release/release-aarch64.json | 2 +- assets/release/release-x86_64.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json index bbe4ffbf4e..d604dcea37 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-04-01-233611" + "base": "4.15.0-0.nightly-arm64-2024-04-02-150630" }, "images": { "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:083039977da3efc48be5b03ca2306451ef9e4cfda0591cd0c4650e14fa333660", 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 2beeb0dc51..7190022301 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-03-29-144548" + "base": "4.15.0-0.nightly-2024-04-02-181803" }, "images": { "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b3cb06207718f4c5f03f0296d93057bd47562dafa463fe8371a0d683ea50e7c8", diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index d5a832aa73..28431941b7 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-04-01-233611" + "base": "4.15.0-0.nightly-arm64-2024-04-02-150630" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9f0f2e06b1f726dba422e1e9b5646992b38f2f203d31c3d95b504b974b55ed89", diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index d1fc4ebb65..a1037e9cbe 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.15.0-0.nightly-2024-03-29-144548" + "base": "4.15.0-0.nightly-2024-04-02-181803" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1e092a8f953c4a29597247dabf02384ac835854ba54da80d0669044e058a91ee", From 478b80505c502fc8c80bec46d9f1c7acaaa8ca89 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 3 Apr 2024 05:08:09 +0000 Subject: [PATCH 3/3] 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 c0ab53bbb5..15847d8f45 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.15.0-0.nightly-arm64-2024-04-01-233611 +OCP_VERSION := 4.15.0-0.nightly-arm64-2024-04-02-150630 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index c81167aca4..94cdfdfe13 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.15.0-0.nightly-2024-03-29-144548 +OCP_VERSION := 4.15.0-0.nightly-2024-04-02-181803