From 72576e0239e87fddc25b3be0bfd24cf6801566bb Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 11 Jul 2024 04:12:33 +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 2337a9a625..aef3260ce7 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.16.0-0.nightly-2024-07-09-215042" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.16.0-0.nightly-arm64-2024-07-09-212638" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.16.0-0.nightly-2024-07-10-162038" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.16.0-0.nightly-arm64-2024-07-10-194635" From 89c2318cdbc46e6df3ae0498bd836fb46534be4e Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 11 Jul 2024 04:12:33 +0000 Subject: [PATCH 2/4] update changelog --- scripts/auto-rebase/changelog.txt | 21 +++------------------ scripts/auto-rebase/commits.txt | 2 +- 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 8a9118ad3f..f82ade0cff 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,19 +1,4 @@ -- machine-config-operator embedded-component 73d5f16fdc96f3d7a4bc87edc77d394e53a8bb9c to 1ec936b6519a118ba05617efbe338e4961c71e7f - - 65a94db4 2024-06-28T14:00:13+00:00 daemon: Handle correctly OS Version for 4.1 and 4.2 bootimages - -- operator-framework-olm embedded-component 555e529c944f9b8b93d2e4d9626e12de51f59854 to ee44d6cb5c16633f9787fc1135d70bd8561da0b6 - - 6e9c9e83 2024-07-08T11:46:29-05:00 Update operator-framework-tools.Dockerfile - - dfa5e458 2024-07-08T11:45:54-05:00 Update operator-framework-tools.Dockerfile - - 345509bb 2024-07-03T13:31:04-05:00 don't erase the filesystem from the base - - ea1b9438 2024-07-03T13:31:04-05:00 switch base image - - 782e7f82 2024-06-24T22:51:05-04:00 [OCPBUGS-34173]: fix sorting unpack jobs (#3299) - - b29ba37e 2024-06-24T07:33:39-05:00 UPSTREAM: : fix xplat compile for of-tools image; hide utest files from git; use rhel8 art builder image - - 096fed55 2024-06-17T12:53:57+02:00 remove default value of catsrc.spec.grpcPodConfig.securityContextConfig (#342) - - b2ba330c 2024-06-17T12:52:23+02:00 OCPBUGS-29729: Updates default security context behavior for catalog source pods (#3206) - -- oc image-amd64 8c491baf99f880bd767cb325effbb35beeb47a6c to 0127eb4d4f1131758ef39f445eba783eaf7b240f - - f3d5e4c2 2024-07-05T14:50:19+01:00 debug: set required-scc annotation to privileged for node debug pods - -- oc image-arm64 8c491baf99f880bd767cb325effbb35beeb47a6c to 0127eb4d4f1131758ef39f445eba783eaf7b240f - - f3d5e4c2 2024-07-05T14:50:19+01:00 debug: set required-scc annotation to privileged for node debug pods +- operator-framework-olm embedded-component ee44d6cb5c16633f9787fc1135d70bd8561da0b6 to f4eac4271317504fcdeaf45fcf30bb01b1cd8bb0 + - ea03cd9a 2024-07-02T10:44:16-07:00 Unpack Job Creation Failure Test (#3297) + - 00690e8f 2024-07-02T10:44:02-07:00 Fix: Ensure jobs without unpack label are considered (#3262) diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index d0ed0f2645..0f8c8c3207 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -13,7 +13,7 @@ https://github.com/openshift/kubernetes embedded-component aba1e8d781a8de14bd80a https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 969a60e9e2466c44f5b3ffd43fe3ecab11bf1e51 https://github.com/openshift/machine-config-operator embedded-component 1ec936b6519a118ba05617efbe338e4961c71e7f https://github.com/openshift/openshift-controller-manager embedded-component 1432fe0aa630ce83c0c3fd18c86e1fb9a47ae4cc -https://github.com/openshift/operator-framework-olm embedded-component ee44d6cb5c16633f9787fc1135d70bd8561da0b6 +https://github.com/openshift/operator-framework-olm embedded-component f4eac4271317504fcdeaf45fcf30bb01b1cd8bb0 https://github.com/openshift/route-controller-manager embedded-component 3112b458983c6fca6f77d5a945fb0026186dace6 https://github.com/openshift/service-ca-operator embedded-component 538c7b98a689e573b61e1abb1cb649da470c5fac https://github.com/openshift/oc image-amd64 0127eb4d4f1131758ef39f445eba783eaf7b240f From 2710797984f74ec39420e50cca6639649edfdc11 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 11 Jul 2024 04:13:05 +0000 Subject: [PATCH 3/4] update manifests --- assets/optional/multus/release-multus-aarch64.json | 2 +- assets/optional/multus/release-multus-x86_64.json | 2 +- .../operator-lifecycle-manager/kustomization.aarch64.yaml | 8 ++++---- .../operator-lifecycle-manager/kustomization.x86_64.yaml | 8 ++++---- .../operator-lifecycle-manager/release-olm-aarch64.json | 6 +++--- .../operator-lifecycle-manager/release-olm-x86_64.json | 6 +++--- assets/release/release-aarch64.json | 2 +- assets/release/release-x86_64.json | 2 +- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/assets/optional/multus/release-multus-aarch64.json b/assets/optional/multus/release-multus-aarch64.json index 1e2fe3daaf..1197843782 100644 --- a/assets/optional/multus/release-multus-aarch64.json +++ b/assets/optional/multus/release-multus-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.16.0-0.nightly-arm64-2024-07-09-212638" + "base": "4.16.0-0.nightly-arm64-2024-07-10-194635" }, "images": { "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2163937c0603665d84995a0cbce385fc4378ed0f928ffe25601526872692cdf4", diff --git a/assets/optional/multus/release-multus-x86_64.json b/assets/optional/multus/release-multus-x86_64.json index 33ea54b4e7..d75a9259b1 100644 --- a/assets/optional/multus/release-multus-x86_64.json +++ b/assets/optional/multus/release-multus-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.16.0-0.nightly-2024-07-09-215042" + "base": "4.16.0-0.nightly-2024-07-10-162038" }, "images": { "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:897f93d7062d3adcebaffdb4e11f7873d87fbb3a9ade8cc613e3a3c3926f5ccb", diff --git a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml index 81b0052913..073d61a45f 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.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:47c01c98d44dae1a65bcacb06b7b083e5ab4b53902daab4ba0233144bab149a8 + digest: sha256:4a3998661e3a9bfea52b57efab205ac95afa94bf8179fcd8d2f6cb9ed9c62822 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:01f531a75aba6c8e72e5aae0e0b5e882f678ff487cda7c5e0e940301cfc44c6d + digest: sha256:b6cc5ec445f063669b5b6951ac24e6dcb761eb94a772dc3bb833238dc293d378 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev digest: sha256:bb30381dd33d379218906ad8c1291a8bc54a0f4505ca07d1447048d61c670c85 @@ -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:01f531a75aba6c8e72e5aae0e0b5e882f678ff487cda7c5e0e940301cfc44c6d + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b6cc5ec445f063669b5b6951ac24e6dcb761eb94a772dc3bb833238dc293d378 - 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:47c01c98d44dae1a65bcacb06b7b083e5ab4b53902daab4ba0233144bab149a8 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4a3998661e3a9bfea52b57efab205ac95afa94bf8179fcd8d2f6cb9ed9c62822 target: kind: Deployment labelSelector: app=catalog-operator diff --git a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml index 844548f3f6..792aca00ce 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:b188518fbbe8fa91dc4ce2a05f00ff93a73025e14dd0ae5621f39d2854ec00c9 + digest: sha256:408ae76d766af71bb4c031365df8988dfbda6ae9b7ab65b2a9f5f8e0574c5273 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:faa0b7d94827569ad06b7797fb02c9314d98abaf730b2aec2fe2e471137ef286 + digest: sha256:000c74529f5c8569855825153a4ea3122e358140133bcb048f7d1d196e0d04d2 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev digest: sha256:3efbfad53f80bd8988582c9047caf18ba8f184cb8d7afaecbac1b78d38ae4b9a @@ -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:faa0b7d94827569ad06b7797fb02c9314d98abaf730b2aec2fe2e471137ef286 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:000c74529f5c8569855825153a4ea3122e358140133bcb048f7d1d196e0d04d2 - 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:b188518fbbe8fa91dc4ce2a05f00ff93a73025e14dd0ae5621f39d2854ec00c9 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:408ae76d766af71bb4c031365df8988dfbda6ae9b7ab65b2a9f5f8e0574c5273 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 efa627affc..370f780917 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json @@ -1,10 +1,10 @@ { "release": { - "base": "4.16.0-0.nightly-arm64-2024-07-09-212638" + "base": "4.16.0-0.nightly-arm64-2024-07-10-194635" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:47c01c98d44dae1a65bcacb06b7b083e5ab4b53902daab4ba0233144bab149a8", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:01f531a75aba6c8e72e5aae0e0b5e882f678ff487cda7c5e0e940301cfc44c6d", + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4a3998661e3a9bfea52b57efab205ac95afa94bf8179fcd8d2f6cb9ed9c62822", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b6cc5ec445f063669b5b6951ac24e6dcb761eb94a772dc3bb833238dc293d378", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bb30381dd33d379218906ad8c1291a8bc54a0f4505ca07d1447048d61c670c85" } } 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 8c6330f4d9..16b994c8cc 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.16.0-0.nightly-2024-07-09-215042" + "base": "4.16.0-0.nightly-2024-07-10-162038" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b188518fbbe8fa91dc4ce2a05f00ff93a73025e14dd0ae5621f39d2854ec00c9", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:faa0b7d94827569ad06b7797fb02c9314d98abaf730b2aec2fe2e471137ef286", + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:408ae76d766af71bb4c031365df8988dfbda6ae9b7ab65b2a9f5f8e0574c5273", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:000c74529f5c8569855825153a4ea3122e358140133bcb048f7d1d196e0d04d2", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3efbfad53f80bd8988582c9047caf18ba8f184cb8d7afaecbac1b78d38ae4b9a" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index c9ef7a848f..ce663af137 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.16.0-0.nightly-arm64-2024-07-09-212638" + "base": "4.16.0-0.nightly-arm64-2024-07-10-194635" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0288db3549e7d7278cd26c2bdf14681cafc2af9d566d2df9387f2dec73beddde", diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 63e124ac26..a726309677 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.16.0-0.nightly-2024-07-09-215042" + "base": "4.16.0-0.nightly-2024-07-10-162038" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7c8b7ff02b12c67468f34f9b3f3fccb450797971dab5ab83ae28077e26e05669", From 97554d716b1cb5a5d83dbd5b5424b7f7ec69d4a9 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 11 Jul 2024 04:13:06 +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 ec395b5000..ad9123dacb 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.16.0-0.nightly-arm64-2024-07-09-212638 +OCP_VERSION := 4.16.0-0.nightly-arm64-2024-07-10-194635 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index ee1b552ee0..a63f085b4b 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.16.0-0.nightly-2024-07-09-215042 +OCP_VERSION := 4.16.0-0.nightly-2024-07-10-162038