From 32b8e0ac56ffbba8d1f2a53a4620ea87d6396fea Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 14 Aug 2024 04:17:15 +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 f3b25d1f7e..376baf51b2 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-08-12-163247" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.15.0-0.nightly-arm64-2024-08-12-215855" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.15.0-0.nightly-2024-08-13-134622" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.15.0-0.nightly-arm64-2024-08-13-113030" From f869c976c9725de7a1a28e74ff826d6e2bf500c7 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 14 Aug 2024 04:17:15 +0000 Subject: [PATCH 2/4] 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..e2efdaeaf5 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -0,0 +1,3 @@ +- operator-framework-olm embedded-component b102225933d5df5b97fe9a691124087d9c3e24d6 to 54c9bb9ffdf3206dcf415bb78d2d37ed5178d69b + - f15c5fe5 2024-08-12T01:37:18+00:00 Merge pull request #832 from perdasilva/perdasilva/junittg + diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index e7d5647697..5b52d1621f 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -13,7 +13,7 @@ https://github.com/openshift/kubernetes embedded-component 396c8817940d592049f2f https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component e8749689edb8e7fea42eca5f2b67c3187192cdeb https://github.com/openshift/machine-config-operator embedded-component 39b19d5873b5d2423c3642bf7b94d2a9848b3d6e https://github.com/openshift/openshift-controller-manager embedded-component 104b9ece0feb24da89fa6b87d90d60dd27fce813 -https://github.com/openshift/operator-framework-olm embedded-component b102225933d5df5b97fe9a691124087d9c3e24d6 +https://github.com/openshift/operator-framework-olm embedded-component 54c9bb9ffdf3206dcf415bb78d2d37ed5178d69b https://github.com/openshift/route-controller-manager embedded-component c5cc7a73705e4086759e2a36811b055b7716def4 https://github.com/openshift/service-ca-operator embedded-component 19f312e96bb4e5b7da9f61ea4cab202b227a60c6 https://github.com/openshift/oc image-amd64 1e41aa3e007fc60af9edfc77be1c610205943f4a From f1a8d191f2f9c6b58bf82325428dfe7eca3e0e45 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 14 Aug 2024 04:17:52 +0000 Subject: [PATCH 3/4] update manifests --- .../operator-lifecycle-manager/kustomization.x86_64.yaml | 8 ++++---- .../operator-lifecycle-manager/release-olm-aarch64.json | 2 +- .../operator-lifecycle-manager/release-olm-x86_64.json | 6 +++--- assets/release/release-aarch64.json | 2 +- assets/release/release-x86_64.json | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml index 2c42e5c906..3d80953c5a 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml @@ -2,10 +2,10 @@ images: - name: quay.io/operator-framework/olm newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:f7f065016d447f74627471f0310269a040f3ef4e2290595babe357bf993ea7e9 + digest: sha256:04a4c299024c54b5e62266a9e998e7ed3890587a66a8f9ddfc15dff67bb9f4ae - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:ecac9f4afc18ff80d99aa056030a785f6399b02ca99e02555b5912b0f6217581 + digest: sha256:8a0f21841de195922aa9fe725ad1bf482f23a3fad24a457cd2a3bc23ee2a6584 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev digest: sha256:ec0d6d14701ace9e6a6e5a4f4b27a652d9bcf7b6de7e5b1118ec5be4cd983748 @@ -16,12 +16,12 @@ patches: path: /spec/template/spec/containers/0/env/- value: name: OPERATOR_REGISTRY_IMAGE - value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ecac9f4afc18ff80d99aa056030a785f6399b02ca99e02555b5912b0f6217581 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8a0f21841de195922aa9fe725ad1bf482f23a3fad24a457cd2a3bc23ee2a6584 - op: add path: /spec/template/spec/containers/0/env/- value: name: OLM_IMAGE - value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f7f065016d447f74627471f0310269a040f3ef4e2290595babe357bf993ea7e9 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:04a4c299024c54b5e62266a9e998e7ed3890587a66a8f9ddfc15dff67bb9f4ae target: kind: Deployment labelSelector: app=catalog-operator diff --git a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json index 1fe84a4f5d..ce806f64fa 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-08-12-215855" + "base": "4.15.0-0.nightly-arm64-2024-08-13-113030" }, "images": { "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e109f7efe2bbcb40e0edc4df811f2a65b4415a78cbd92f7b1dea531eca8ea5f2", 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 783ede9e69..653e851af2 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json @@ -1,10 +1,10 @@ { "release": { - "base": "4.15.0-0.nightly-2024-08-12-163247" + "base": "4.15.0-0.nightly-2024-08-13-134622" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f7f065016d447f74627471f0310269a040f3ef4e2290595babe357bf993ea7e9", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ecac9f4afc18ff80d99aa056030a785f6399b02ca99e02555b5912b0f6217581", + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:04a4c299024c54b5e62266a9e998e7ed3890587a66a8f9ddfc15dff67bb9f4ae", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8a0f21841de195922aa9fe725ad1bf482f23a3fad24a457cd2a3bc23ee2a6584", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ec0d6d14701ace9e6a6e5a4f4b27a652d9bcf7b6de7e5b1118ec5be4cd983748" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 8cf8f7f941..0945a507e4 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-08-12-215855" + "base": "4.15.0-0.nightly-arm64-2024-08-13-113030" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a86bf8cd9ab26422c89e8ec6c5eeeba694a62b1d8c3e60846b89c05562d54098", diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 94dfaed255..f54e4f365c 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-08-12-163247" + "base": "4.15.0-0.nightly-2024-08-13-134622" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:12cf2b77952d1eea164772ddf62ba4eb7c8c889e37b8177cd3ffc8aa33c2fddf", From 32a61be618ec165dd53f1723fc26fb8185d86175 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 14 Aug 2024 04:17:58 +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 f6035194bf..ee556fc1c1 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.15.0-0.nightly-arm64-2024-08-12-215855 +OCP_VERSION := 4.15.0-0.nightly-arm64-2024-08-13-113030 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index 95e69fec4a..1367d9a076 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.15.0-0.nightly-2024-08-12-163247 +OCP_VERSION := 4.15.0-0.nightly-2024-08-13-134622