[OPENJDK-407] Use UBI-8 specific Content Sets

This is to avoid accidentally installing a RHEL-8 package that
is not in the UBI set.

Signed-off-by: Jonathan Dowland <[email protected]>

Author: jmtd

redhat/ubi8-openjdk-11-runtime.yaml

@@ -14,14 +14,14 @@ packages:
   manager: microdnf
   content_sets:
     x86_64:
-    - rhel-8-for-x86_64-baseos-rpms
-    - rhel-8-for-x86_64-appstream-rpms
+    - ubi-8-for-x86_64-baseos-rpms__8
+    - ubi-8-for-x86_64-appstream-rpms__8
     ppc64le:
-    - rhel-8-for-ppc64le-baseos-rpms
-    - rhel-8-for-ppc64le-appstream-rpms
+    - ubi-8-for-ppc64le-appstream-rpms__8
+    - ubi-8-for-ppc64le-baseos-rpms__8
     aarch64:
-    - rhel-8-for-aarch64-baseos-rpms
-    - rhel-8-for-aarch64-appstream-rpms
+    - ubi-8-for-aarch64-baseos-rpms__8
+    - ubi-8-for-aarch64-appstream-rpms__8
     s390x:
-    - rhel-8-for-s390x-baseos-rpms
-    - rhel-8-for-s390x-appstream-rpms
+    - ubi-8-for-s390x-baseos-rpms__8
+    - ubi-8-for-s390x-appstream-rpms__8

redhat/ubi8-openjdk-11.yaml

@@ -16,14 +16,14 @@ packages:
   manager: microdnf
   content_sets:
     x86_64:
-    - rhel-8-for-x86_64-baseos-rpms
-    - rhel-8-for-x86_64-appstream-rpms
+    - ubi-8-for-x86_64-baseos-rpms__8
+    - ubi-8-for-x86_64-appstream-rpms__8
     ppc64le:
-    - rhel-8-for-ppc64le-baseos-rpms
-    - rhel-8-for-ppc64le-appstream-rpms
+    - ubi-8-for-ppc64le-appstream-rpms__8
+    - ubi-8-for-ppc64le-baseos-rpms__8
     aarch64:
-    - rhel-8-for-aarch64-baseos-rpms
-    - rhel-8-for-aarch64-appstream-rpms
+    - ubi-8-for-aarch64-baseos-rpms__8
+    - ubi-8-for-aarch64-appstream-rpms__8
     s390x:
-    - rhel-8-for-s390x-baseos-rpms
-    - rhel-8-for-s390x-appstream-rpms
+    - ubi-8-for-s390x-baseos-rpms__8
+    - ubi-8-for-s390x-appstream-rpms__8

redhat/ubi8-openjdk-8-runtime.yaml

@@ -14,14 +14,14 @@ packages:
   manager: microdnf
   content_sets:
     x86_64:
-    - rhel-8-for-x86_64-baseos-rpms
-    - rhel-8-for-x86_64-appstream-rpms
+    - ubi-8-for-x86_64-baseos-rpms__8
+    - ubi-8-for-x86_64-appstream-rpms__8
     ppc64le:
-    - rhel-8-for-ppc64le-baseos-rpms
-    - rhel-8-for-ppc64le-appstream-rpms
+    - ubi-8-for-ppc64le-appstream-rpms__8
+    - ubi-8-for-ppc64le-baseos-rpms__8
     aarch64:
-    - rhel-8-for-aarch64-baseos-rpms
-    - rhel-8-for-aarch64-appstream-rpms
+    - ubi-8-for-aarch64-baseos-rpms__8
+    - ubi-8-for-aarch64-appstream-rpms__8
     s390x:
-    - rhel-8-for-s390x-baseos-rpms
-    - rhel-8-for-s390x-appstream-rpms
+    - ubi-8-for-s390x-baseos-rpms__8
+    - ubi-8-for-s390x-appstream-rpms__8

redhat/ubi8-openjdk-8.yaml

@@ -16,14 +16,14 @@ packages:
   manager: microdnf
   content_sets:
     x86_64:
-    - rhel-8-for-x86_64-baseos-rpms
-    - rhel-8-for-x86_64-appstream-rpms
+    - ubi-8-for-x86_64-baseos-rpms__8
+    - ubi-8-for-x86_64-appstream-rpms__8
     ppc64le:
-    - rhel-8-for-ppc64le-baseos-rpms
-    - rhel-8-for-ppc64le-appstream-rpms
+    - ubi-8-for-ppc64le-appstream-rpms__8
+    - ubi-8-for-ppc64le-baseos-rpms__8
     aarch64:
-    - rhel-8-for-aarch64-baseos-rpms
-    - rhel-8-for-aarch64-appstream-rpms
+    - ubi-8-for-aarch64-baseos-rpms__8
+    - ubi-8-for-aarch64-appstream-rpms__8
     s390x:
-    - rhel-8-for-s390x-baseos-rpms
-    - rhel-8-for-s390x-appstream-rpms
+    - ubi-8-for-s390x-baseos-rpms__8
+    - ubi-8-for-s390x-appstream-rpms__8