Merge pull request #13984 from rhmdnd/CMP-3540-add-new-openshift-cpes

CMP-3540: Add new OpenShift CPEs

Author: yuumasato

products/ocp4/product.yml

@@ -102,6 +102,36 @@ cpes:
       title: "Red Hat OpenShift Container Platform 4.18"
       check_id: installed_app_is_ocp4_18
 
+  - ocp4.19:
+      name: "cpe:/a:redhat:openshift_container_platform:4.19"
+      title: "Red Hat OpenShift Container Platform 4.19"
+      check_id: installed_app_is_ocp4_19
+
+  - ocp4.20:
+      name: "cpe:/a:redhat:openshift_container_platform:4.20"
+      title: "Red Hat OpenShift Container Platform 4.20"
+      check_id: installed_app_is_ocp4_20
+
+  - ocp4.21:
+      name: "cpe:/a:redhat:openshift_container_platform:4.21"
+      title: "Red Hat OpenShift Container Platform 4.21"
+      check_id: installed_app_is_ocp4_21
+
+  - ocp4.22:
+      name: "cpe:/a:redhat:openshift_container_platform:4.22"
+      title: "Red Hat OpenShift Container Platform 4.22"
+      check_id: installed_app_is_ocp4_22
+
+  - ocp4.23:
+      name: "cpe:/a:redhat:openshift_container_platform:4.23"
+      title: "Red Hat OpenShift Container Platform 4.23"
+      check_id: installed_app_is_ocp4_23
+
+  - ocp4.24:
+      name: "cpe:/a:redhat:openshift_container_platform:4.24"
+      title: "Red Hat OpenShift Container Platform 4.24"
+      check_id: installed_app_is_ocp4_24
+
   - ocp4-on-aws:
       name: "cpe:/a:redhat:openshift_container_platform_on_aws:4"
       title: "Red Hat OpenShift Container Platform 4 on AWS"

shared/applicability/oval/installed_app_is_ocp4.xml

@@ -101,7 +101,7 @@
       </ind:value>
   </ind:yamlfilecontent_state>
 
-{{% for minorversion in range(6, 19) %}}
+{{% for minorversion in range(6, 25) %}}
   <!-- Check for OpenShift Container Platform 4.{{{ minorversion }}} -->
   <definition class="inventory" id="installed_app_is_ocp4_{{{ minorversion }}}" version="1">
     <metadata>

tests/data/product_stability/ocp4.yml

@@ -88,6 +88,30 @@ cpes:
     check_id: installed_app_is_ocp4_18
     name: cpe:/a:redhat:openshift_container_platform:4.18
     title: Red Hat OpenShift Container Platform 4.18
+- ocp4.19:
+    check_id: installed_app_is_ocp4_19
+    name: cpe:/a:redhat:openshift_container_platform:4.19
+    title: Red Hat OpenShift Container Platform 4.19
+- ocp4.20:
+    check_id: installed_app_is_ocp4_20
+    name: cpe:/a:redhat:openshift_container_platform:4.20
+    title: Red Hat OpenShift Container Platform 4.20
+- ocp4.21:
+    check_id: installed_app_is_ocp4_21
+    name: cpe:/a:redhat:openshift_container_platform:4.21
+    title: Red Hat OpenShift Container Platform 4.21
+- ocp4.22:
+    check_id: installed_app_is_ocp4_22
+    name: cpe:/a:redhat:openshift_container_platform:4.22
+    title: Red Hat OpenShift Container Platform 4.22
+- ocp4.23:
+    check_id: installed_app_is_ocp4_23
+    name: cpe:/a:redhat:openshift_container_platform:4.23
+    title: Red Hat OpenShift Container Platform 4.23
+- ocp4.24:
+    check_id: installed_app_is_ocp4_24
+    name: cpe:/a:redhat:openshift_container_platform:4.24
+    title: Red Hat OpenShift Container Platform 4.24
 - ocp4-on-aws:
     check_id: installed_app_is_ocp4_on_aws
     name: cpe:/a:redhat:openshift_container_platform_on_aws:4