NO-ISSUE: rebase-release-4.16-4.16.0-0.nightly-2024-06-12-064233_amd64-2024-06-12_arm64-2024-06-12 (#3478)

microshift-rebase-script[bot] · ci-robot · web-flow · commit c5a37dff79a7 · 2024-06-13T14:18:49.000Z
* update last_rebase.sh

* update changelog

* update manifests

* update buildfiles

---------

Co-authored-by: ci-robot &lt;ci-robot@openshift.io&gt;
diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var
@@ -1 +1 @@
-OCP_VERSION := 4.16.0-0.nightly-arm64-2024-06-11-210012
+OCP_VERSION := 4.16.0-0.nightly-arm64-2024-06-12-211629
diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var
@@ -1 +1 @@
-OCP_VERSION := 4.16.0-0.nightly-2024-06-11-104727
+OCP_VERSION := 4.16.0-0.nightly-2024-06-12-064233
diff --git 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-06-11-210012"
+    "base": "4.16.0-0.nightly-arm64-2024-06-12-211629"
   },
   "images": {
     "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0b43e95d1e5e3657993077692e2a535bcfc84222fc50d4a610566c72a3adb5b9",
diff --git 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-06-11-104727"
+    "base": "4.16.0-0.nightly-2024-06-12-064233"
   },
   "images": {
     "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:07054298b748fdfa4165c597bff690a2b678b668e25d1949f669d5b1a826c51d",
diff --git 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:1515f6bbdda8550f8ce074d360c6613493765f18048414da209115d976192fc5
+    digest: sha256:ca96ff57cc96163c8e6c6818d1b86d4b6ac84596f7f5e5b0496ce92cab936784
   - name: quay.io/operator-framework/configmap-operator-registry
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:3dd778300cea80666f021337f0858856bd53cdee9400a5abae3c134a6dd70389
+    digest: sha256:d88823b72008072d1f009097c22213ac4a18081409f52b5f25db28a3447ad1e5
   - name: quay.io/openshift/origin-kube-rbac-proxy
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
     digest: sha256:0852ac156488c0ccb848f54dad5faf11c3539f38ae89d804ac058b33abef4cd6
@@ -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:3dd778300cea80666f021337f0858856bd53cdee9400a5abae3c134a6dd70389
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d88823b72008072d1f009097c22213ac4a18081409f52b5f25db28a3447ad1e5
      - 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:1515f6bbdda8550f8ce074d360c6613493765f18048414da209115d976192fc5
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ca96ff57cc96163c8e6c6818d1b86d4b6ac84596f7f5e5b0496ce92cab936784
     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
@@ -2,10 +2,10 @@
 images:
   - name: quay.io/operator-framework/olm
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:2c4e5ccaa31ef2b2b96b7debef74d7727fd1b1f149673ef6390e06350a9363a5
+    digest: sha256:516ab71a8995d39b161c42c87d087c244e2c73eb43d1fbc4b221887b0156ca0c
   - name: quay.io/operator-framework/configmap-operator-registry
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:61a15f95d72e2fae51b65cde778bd431d84c91ccc156454de4b9fd1a666d3ca5
+    digest: sha256:04f40b126b7788279ef65738e880a2b16e81ed77fc50c54cf8a656a46fdc9ec7
   - name: quay.io/openshift/origin-kube-rbac-proxy
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
     digest: sha256:512d00ce0e38397033cf680e4e43ccb424ed63a81379d79cda3c23d9c9892abf
@@ -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:61a15f95d72e2fae51b65cde778bd431d84c91ccc156454de4b9fd1a666d3ca5
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:04f40b126b7788279ef65738e880a2b16e81ed77fc50c54cf8a656a46fdc9ec7
      - 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:2c4e5ccaa31ef2b2b96b7debef74d7727fd1b1f149673ef6390e06350a9363a5
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:516ab71a8995d39b161c42c87d087c244e2c73eb43d1fbc4b221887b0156ca0c
     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
@@ -1,10 +1,10 @@
 {
   "release": {
-    "base": "4.16.0-0.nightly-arm64-2024-06-11-210012"
+    "base": "4.16.0-0.nightly-arm64-2024-06-12-211629"
   },
   "images": {
-    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1515f6bbdda8550f8ce074d360c6613493765f18048414da209115d976192fc5",
-    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3dd778300cea80666f021337f0858856bd53cdee9400a5abae3c134a6dd70389",
+    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ca96ff57cc96163c8e6c6818d1b86d4b6ac84596f7f5e5b0496ce92cab936784",
+    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d88823b72008072d1f009097c22213ac4a18081409f52b5f25db28a3447ad1e5",
     "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0852ac156488c0ccb848f54dad5faf11c3539f38ae89d804ac058b33abef4cd6"
   }
 }
diff --git 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-06-11-104727"
+    "base": "4.16.0-0.nightly-2024-06-12-064233"
   },
   "images": {
-    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2c4e5ccaa31ef2b2b96b7debef74d7727fd1b1f149673ef6390e06350a9363a5",
-    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:61a15f95d72e2fae51b65cde778bd431d84c91ccc156454de4b9fd1a666d3ca5",
+    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:516ab71a8995d39b161c42c87d087c244e2c73eb43d1fbc4b221887b0156ca0c",
+    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:04f40b126b7788279ef65738e880a2b16e81ed77fc50c54cf8a656a46fdc9ec7",
     "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:512d00ce0e38397033cf680e4e43ccb424ed63a81379d79cda3c23d9c9892abf"
   }
 }
diff --git 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-06-11-210012"
+    "base": "4.16.0-0.nightly-arm64-2024-06-12-211629"
   },
   "images": {
     "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6164d2d9e2b3ae377672a8c67cb8ba9f163097577811d102ace3ffa014903072",
diff --git 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-06-11-104727"
+    "base": "4.16.0-0.nightly-2024-06-12-064233"
   },
   "images": {
     "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9a6bcee60b7a498e2ffb8e945e3a19260cd18dd2cad7712721ce7e582d1c8c4b",
diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt
@@ -1,6 +1,10 @@
-- machine-config-operator embedded-component 53f3e1eef97a3e1c2cae0b3cbcae3e10f9228d8d to 03b4015daebb7b41004cd581bb9cbe7faacf120a
-  - d3b71f88 2024-06-06T23:12:11+00:00 *: ensure event handlers are registered after queue is configured
-
-- kubernetes image-arm64 f6419fba786afe73e14412e43ee5645184addd92 to b2f5b1171deb4bbf754961c8b72ac31d2548c896
-  - 8b8df1a82 2024-05-29T08:13:01+00:00 UPSTREAM: <carry>: extend termination events
+- operator-framework-olm embedded-component 56b7b9d5a6a063dad50e5f5a31b6dca7012c8345 to 1aacee6a78ceac7acd5aa03647933e550d66a12c
+  - ae0494a0 2024-06-09T10:10:06+02:00 pin test catalog
+  - f355a8f9 2024-06-08T19:59:11+02:00 patch subscription e2e flake (#3302)
+  - f8cf872e 2024-06-08T19:59:07+02:00 patch installplan e2e (#3301)
+  - 8d67f6da 2024-06-06T12:59:49+02:00 :seedling: update skopeo openshift test (#3298)
+  - 8f9e3dd5 2024-06-06T12:59:48+02:00 re-enable seed and skip options for e2e (#3296)
+  - 5c0959e4 2024-06-06T12:59:25+02:00 :seedling: parameterizes the e2e target and pins opm images (#3275)
+  - d22e45e7 2024-06-05T15:28:44+02:00 :seedling: patch flakes (#3281)
+  - d0196440 2024-06-05T15:26:08+02:00 bugfix: refactor test package names 'packageA' and 'packageB' because they break naming conventions (#3260)
 
diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt
@@ -13,7 +13,7 @@ https://github.com/openshift/kubernetes embedded-component b2f5b1171deb4bbf75496
 https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 969a60e9e2466c44f5b3ffd43fe3ecab11bf1e51
 https://github.com/openshift/machine-config-operator embedded-component 03b4015daebb7b41004cd581bb9cbe7faacf120a
 https://github.com/openshift/openshift-controller-manager embedded-component 1432fe0aa630ce83c0c3fd18c86e1fb9a47ae4cc
-https://github.com/openshift/operator-framework-olm embedded-component 56b7b9d5a6a063dad50e5f5a31b6dca7012c8345
+https://github.com/openshift/operator-framework-olm embedded-component 1aacee6a78ceac7acd5aa03647933e550d66a12c
 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 a2450418f7b12a71e8f3562a4e9aa8a976bbf85b
diff --git 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-06-11-104727" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.16.0-0.nightly-arm64-2024-06-11-210012"
+./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.16.0-0.nightly-2024-06-12-064233" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.16.0-0.nightly-arm64-2024-06-12-211629"

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-OCP_VERSION := 4.16.0-0.nightly-arm64-2024-06-11-210012`
	`1`	`+OCP_VERSION := 4.16.0-0.nightly-arm64-2024-06-12-211629`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-OCP_VERSION := 4.16.0-0.nightly-2024-06-11-104727`
	`1`	`+OCP_VERSION := 4.16.0-0.nightly-2024-06-12-064233`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"release": {`
`3`		`- "base": "4.16.0-0.nightly-arm64-2024-06-11-210012"`
	`3`	`+ "base": "4.16.0-0.nightly-arm64-2024-06-12-211629"`
`4`	`4`	`},`
`5`	`5`	`"images": {`
`6`	`6`	`"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0b43e95d1e5e3657993077692e2a535bcfc84222fc50d4a610566c72a3adb5b9",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"release": {`
`3`		`- "base": "4.16.0-0.nightly-2024-06-11-104727"`
	`3`	`+ "base": "4.16.0-0.nightly-2024-06-12-064233"`
`4`	`4`	`},`
`5`	`5`	`"images": {`
`6`	`6`	`"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:07054298b748fdfa4165c597bff690a2b678b668e25d1949f669d5b1a826c51d",`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`	`1`	`{`
`2`	`2`	`"release": {`
`3`		`- "base": "4.16.0-0.nightly-arm64-2024-06-11-210012"`
	`3`	`+ "base": "4.16.0-0.nightly-arm64-2024-06-12-211629"`
`4`	`4`	`},`
`5`	`5`	`"images": {`
`6`		`- "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1515f6bbdda8550f8ce074d360c6613493765f18048414da209115d976192fc5",`
`7`		`- "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3dd778300cea80666f021337f0858856bd53cdee9400a5abae3c134a6dd70389",`
	`6`	`+ "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ca96ff57cc96163c8e6c6818d1b86d4b6ac84596f7f5e5b0496ce92cab936784",`
	`7`	`+ "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d88823b72008072d1f009097c22213ac4a18081409f52b5f25db28a3447ad1e5",`
`8`	`8`	`"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0852ac156488c0ccb848f54dad5faf11c3539f38ae89d804ac058b33abef4cd6"`
`9`	`9`	`}`
`10`	`10`	`}`