Merge pull request #232 from jmtd/revert-ubi8-repo-change-develop

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

Author: jmtd

redhat/ubi8-openjdk-11-runtime.yaml

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

redhat/ubi8-openjdk-11.yaml

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

redhat/ubi8-openjdk-8-runtime.yaml

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

redhat/ubi8-openjdk-8.yaml

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