Automated CVP content_set_check fix for openshift-4.10

Created by build https://saml.buildvm.hosts.prod.psi.bos.redhat.com:8888/job/aos-cd-builds/job/build%252Freview-cvp/2120

images/driver-toolkit.yml

@@ -31,3 +31,5 @@ from:
 name: openshift/ose-driver-toolkit
 owners:
 - [email protected]
+non_shipping_repos:
+- rhel-8-server-ose-rpms-embargoed

images/openshift-base-rhel8.yml

@@ -25,9 +25,6 @@ content:
 enabled_repos:
 - rhel-8-appstream-rpms
 - rhel-8-baseos-rpms
-  # sometimes we ship RHEL content ahead of RHEL (usually for RHCOS).
-  # update with that content too so we avoid out-of-date assembly issues:
-- rhel-8-server-ose-rpms-embargoed
 for_payload: false
 for_release: false
 from:

images/openshift-enterprise-tests.yml

@@ -30,8 +30,7 @@ from:
   member: ose-tools
 labels:
   License: GPLv2+
-  io.k8s.description: OpenShift is a platform for developing, building, and deploying
-    containerized applications.
+  io.k8s.description: OpenShift is a platform for developing, building, and deploying containerized applications.
   io.k8s.display-name: OpenShift End-to-End Tests
   io.openshift.tags: openshift,tests,e2e
   vendor: Red Hat

images/openshift-kubernetes-nmstate-handler.yml

@@ -31,3 +31,5 @@ owners:
 - [email protected]
 - [email protected]
 - [email protected]
+non_shipping_repos:
+- rhel-8-server-ose-rpms-embargoed

images/ose-frr.yml

@@ -19,3 +19,5 @@ name: openshift/frr-rhel8
 name_in_bundle: metallb-frr-rhel8
 owners:
 - [email protected]
+non_shipping_repos:
+- rhel-8-server-ose-rpms-embargoed

images/ose-image-customization-controller.yml

@@ -23,5 +23,3 @@ from:
 name: openshift/ose-image-customization-controller
 owners:
 - [email protected]
-non_shipping_repos:
-- rhel-8-server-ose-rpms-embargoed

images/ose-metallb-operator.yml

@@ -25,5 +25,4 @@ update-csv:
   bundle-dir: '{MAJOR}.{MINOR}/'
   manifests-dir: manifests/
   registry: image-registry.openshift-image-registry.svc:5000
-  valid-subscription-label: '["OpenShift Kubernetes Engine", "OpenShift Container
-    Platform", "OpenShift Platform Plus"]'
+  valid-subscription-label: '["OpenShift Kubernetes Engine", "OpenShift Container Platform", "OpenShift Platform Plus"]'

images/ose-tools.yml

@@ -21,8 +21,7 @@ from:
   member: openshift-enterprise-cli
 labels:
   License: GPLv2+
-  io.k8s.description: Contains debugging and diagnostic tools for use with an OpenShift
-    cluster.
+  io.k8s.description: Contains debugging and diagnostic tools for use with an OpenShift cluster.
   io.k8s.display-name: OpenShift Tools
   io.openshift.tags: openshift,tools
   vendor: Red Hat