From 3f43377c4b9fc6e473e5e05562e4b9d76516e6c9 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 6 Jun 2023 05:08:40 +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 0b94e17d4d..d7fdd1059b 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.13.0-0.nightly-2023-06-03-192019" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.13.0-0.nightly-arm64-2023-06-03-192022" "registry.access.redhat.com/lvms4/lvms-operator-bundle:v4.12" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.13.0-0.nightly-2023-06-05-164816" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.13.0-0.nightly-arm64-2023-06-05-230942" "registry.access.redhat.com/lvms4/lvms-operator-bundle:v4.12" From d707b90324d8fcc59b90755d3746df9103d68597 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 6 Jun 2023 05:08:40 +0000 Subject: [PATCH 2/4] update changelog --- scripts/auto-rebase/changelog.txt | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 13ef3566cf..e69de29bb2 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,16 +0,0 @@ -# cluster-ingress-operator embedded-component 7262c34b3a6434b49851ff5f0cceec87a2ee9706 to 502e3517f8f10b7d36c7d9d78197db49dae7f2e6 -385e4620ea49da663e1ffdc7fa39d2c6df17ca85 2023-04-28T16:31:10+00:00 gatewayclass: Update for OSSM 2.4 API change -# cluster-network-operator embedded-component 3ed6bef191d49ede92ab8f7f684826a1b7967928 to 924fd3c589f0dc345807550965ef80099311b82a -67ee7aff147b5dffc37583bdcd343b1430f47d15 2023-05-31T16:08:07+00:00 Remove allowlist reconciler namespace check -9820366d3eeba2e21bdf2a3f29505c7f0f8cb696 2023-05-31T16:08:07+00:00 Update operconfig to only have one recurring reconciler -1001e2edf3f4b4cc9902ed256721a4e93b965611 2023-05-31T16:08:07+00:00 Update allowlist reconciler to watch specific namespace -# kubernetes embedded-component 0001a21b5c48ec2befb79e06949a0db8120ea413 to 7a891f05c7beb9527024c7616d95f6ff5c309f27 -8e99807138ff8771e498003dd4c809e2835757c8 2023-05-17T13:06:14-04:00 UPSTREAM: : kubelet/cm: disable cpu load balancing on slices when using static cpu manager policy -# oc image-amd64 1024efcddde13f3a08dd1725f94d8b8bd7462b6a to 05d83eff7e17160e679898a2a5cd6019ec252c49 -340032ed100b1a4e5380a9d2d0dae483df9fcec8 2023-05-30T07:10:15+00:00 preserve explicit release image -# kubernetes image-amd64 0001a21b5c48ec2befb79e06949a0db8120ea413 to 7a891f05c7beb9527024c7616d95f6ff5c309f27 -8e99807138ff8771e498003dd4c809e2835757c8 2023-05-17T13:06:14-04:00 UPSTREAM: : kubelet/cm: disable cpu load balancing on slices when using static cpu manager policy -# oc image-arm64 1024efcddde13f3a08dd1725f94d8b8bd7462b6a to 05d83eff7e17160e679898a2a5cd6019ec252c49 -340032ed100b1a4e5380a9d2d0dae483df9fcec8 2023-05-30T07:10:15+00:00 preserve explicit release image -# kubernetes image-arm64 0001a21b5c48ec2befb79e06949a0db8120ea413 to 7a891f05c7beb9527024c7616d95f6ff5c309f27 -8e99807138ff8771e498003dd4c809e2835757c8 2023-05-17T13:06:14-04:00 UPSTREAM: : kubelet/cm: disable cpu load balancing on slices when using static cpu manager policy From 15424d3cf3585b50df2df7e430a189b7826d615d Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 6 Jun 2023 05:09:43 +0000 Subject: [PATCH 3/4] update manifests --- assets/release/release-aarch64.json | 2 +- assets/release/release-x86_64.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 6d1c4ba167..b61dcd64b6 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.13.0-0.nightly-arm64-2023-06-03-192022" + "base": "4.13.0-0.nightly-arm64-2023-06-05-230942" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:735f70c9a041a4a960723c847debee91b3ca95050f00d651c723f4c37f4666af", diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 69051b61ea..be05dd6c0f 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.13.0-0.nightly-2023-06-03-192019" + "base": "4.13.0-0.nightly-2023-06-05-164816" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a53b9de5f1ebf995a053f9ea36126339fe0c943cd8bfedf9f197c4f5b4356d70", From af8581045c0f8e7b90da6c34399f6c29a910a9bc Mon Sep 17 00:00:00 2001 From: ci-robot Date: Tue, 6 Jun 2023 05:09:45 +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 dafabf6a4d..21133e852b 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.13.0-0.nightly-arm64-2023-06-03-192022 +OCP_VERSION := 4.13.0-0.nightly-arm64-2023-06-05-230942 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index 9a71224116..82125e3399 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.13.0-0.nightly-2023-06-03-192019 +OCP_VERSION := 4.13.0-0.nightly-2023-06-05-164816