diff --git a/applications/openshift/master/file_groupowner_ovn_cni_server_sock/tests/ocp4/4.12.yml b/applications/openshift/master/file_groupowner_ovn_cni_server_sock/tests/ocp4/4.12.yml deleted file mode 100644 index a700773455b..00000000000 --- a/applications/openshift/master/file_groupowner_ovn_cni_server_sock/tests/ocp4/4.12.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -default_result: PASS - diff --git a/applications/openshift/master/file_groupowner_ovn_cni_server_sock/tests/ocp4/4.13.yml b/applications/openshift/master/file_groupowner_ovn_cni_server_sock/tests/ocp4/4.13.yml deleted file mode 100644 index a700773455b..00000000000 --- a/applications/openshift/master/file_groupowner_ovn_cni_server_sock/tests/ocp4/4.13.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -default_result: PASS - diff --git a/applications/openshift/master/file_groupowner_ovn_cni_server_sock/tests/ocp4/e2e.yml b/applications/openshift/master/file_groupowner_ovn_cni_server_sock/tests/ocp4/e2e.yml index 26875d6e9f6..a700773455b 100644 --- a/applications/openshift/master/file_groupowner_ovn_cni_server_sock/tests/ocp4/e2e.yml +++ b/applications/openshift/master/file_groupowner_ovn_cni_server_sock/tests/ocp4/e2e.yml @@ -1,3 +1,3 @@ --- -default_result: NOT-APPLICABLE +default_result: PASS diff --git a/applications/openshift/master/file_groupowner_ovn_db_files/tests/ocp4/4.12.yml b/applications/openshift/master/file_groupowner_ovn_db_files/tests/ocp4/4.12.yml deleted file mode 100644 index a700773455b..00000000000 --- a/applications/openshift/master/file_groupowner_ovn_db_files/tests/ocp4/4.12.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -default_result: PASS - diff --git a/applications/openshift/master/file_groupowner_ovn_db_files/tests/ocp4/4.13.yml b/applications/openshift/master/file_groupowner_ovn_db_files/tests/ocp4/4.13.yml deleted file mode 100644 index a700773455b..00000000000 --- a/applications/openshift/master/file_groupowner_ovn_db_files/tests/ocp4/4.13.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -default_result: PASS - diff --git a/applications/openshift/master/file_groupowner_ovn_db_files/tests/ocp4/e2e.yml b/applications/openshift/master/file_groupowner_ovn_db_files/tests/ocp4/e2e.yml index 26875d6e9f6..a700773455b 100644 --- a/applications/openshift/master/file_groupowner_ovn_db_files/tests/ocp4/e2e.yml +++ b/applications/openshift/master/file_groupowner_ovn_db_files/tests/ocp4/e2e.yml @@ -1,3 +1,3 @@ --- -default_result: NOT-APPLICABLE +default_result: PASS diff --git a/applications/openshift/master/file_owner_ovn_cni_server_sock/tests/ocp4/4.12.yml b/applications/openshift/master/file_owner_ovn_cni_server_sock/tests/ocp4/4.12.yml deleted file mode 100644 index a700773455b..00000000000 --- a/applications/openshift/master/file_owner_ovn_cni_server_sock/tests/ocp4/4.12.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -default_result: PASS - diff --git a/applications/openshift/master/file_owner_ovn_cni_server_sock/tests/ocp4/4.13.yml b/applications/openshift/master/file_owner_ovn_cni_server_sock/tests/ocp4/4.13.yml deleted file mode 100644 index a700773455b..00000000000 --- a/applications/openshift/master/file_owner_ovn_cni_server_sock/tests/ocp4/4.13.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -default_result: PASS - diff --git a/applications/openshift/master/file_owner_ovn_cni_server_sock/tests/ocp4/4.14.yml b/applications/openshift/master/file_owner_ovn_cni_server_sock/tests/ocp4/4.14.yml deleted file mode 100644 index 26875d6e9f6..00000000000 --- a/applications/openshift/master/file_owner_ovn_cni_server_sock/tests/ocp4/4.14.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -default_result: NOT-APPLICABLE - diff --git a/applications/openshift/master/file_owner_ovn_cni_server_sock/tests/ocp4/4.15.yml b/applications/openshift/master/file_owner_ovn_cni_server_sock/tests/ocp4/4.15.yml deleted file mode 100644 index 26875d6e9f6..00000000000 --- a/applications/openshift/master/file_owner_ovn_cni_server_sock/tests/ocp4/4.15.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -default_result: NOT-APPLICABLE - diff --git a/applications/openshift/master/file_owner_ovn_cni_server_sock/tests/ocp4/e2e.yml b/applications/openshift/master/file_owner_ovn_cni_server_sock/tests/ocp4/e2e.yml index d833f6aaf36..b49fd368b98 100644 --- a/applications/openshift/master/file_owner_ovn_cni_server_sock/tests/ocp4/e2e.yml +++ b/applications/openshift/master/file_owner_ovn_cni_server_sock/tests/ocp4/e2e.yml @@ -1,5 +1,2 @@ --- -default_result: - master: PASS - worker: NOT-APPLICABLE - +default_result: PASS diff --git a/applications/openshift/master/file_owner_ovn_db_files/tests/ocp4/4.12.yml b/applications/openshift/master/file_owner_ovn_db_files/tests/ocp4/4.12.yml deleted file mode 100644 index a700773455b..00000000000 --- a/applications/openshift/master/file_owner_ovn_db_files/tests/ocp4/4.12.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -default_result: PASS - diff --git a/applications/openshift/master/file_owner_ovn_db_files/tests/ocp4/4.13.yml b/applications/openshift/master/file_owner_ovn_db_files/tests/ocp4/4.13.yml deleted file mode 100644 index a700773455b..00000000000 --- a/applications/openshift/master/file_owner_ovn_db_files/tests/ocp4/4.13.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -default_result: PASS - diff --git a/applications/openshift/master/file_owner_ovn_db_files/tests/ocp4/e2e.yml b/applications/openshift/master/file_owner_ovn_db_files/tests/ocp4/e2e.yml index 26875d6e9f6..a700773455b 100644 --- a/applications/openshift/master/file_owner_ovn_db_files/tests/ocp4/e2e.yml +++ b/applications/openshift/master/file_owner_ovn_db_files/tests/ocp4/e2e.yml @@ -1,3 +1,3 @@ --- -default_result: NOT-APPLICABLE +default_result: PASS diff --git a/applications/openshift/master/file_permissions_ovn_cni_server_sock/tests/ocp4/4.12.yml b/applications/openshift/master/file_permissions_ovn_cni_server_sock/tests/ocp4/4.12.yml deleted file mode 100644 index a700773455b..00000000000 --- a/applications/openshift/master/file_permissions_ovn_cni_server_sock/tests/ocp4/4.12.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -default_result: PASS - diff --git a/applications/openshift/master/file_permissions_ovn_cni_server_sock/tests/ocp4/4.13.yml b/applications/openshift/master/file_permissions_ovn_cni_server_sock/tests/ocp4/4.13.yml deleted file mode 100644 index a700773455b..00000000000 --- a/applications/openshift/master/file_permissions_ovn_cni_server_sock/tests/ocp4/4.13.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -default_result: PASS - diff --git a/applications/openshift/master/file_permissions_ovn_cni_server_sock/tests/ocp4/e2e.yml b/applications/openshift/master/file_permissions_ovn_cni_server_sock/tests/ocp4/e2e.yml index 26875d6e9f6..a700773455b 100644 --- a/applications/openshift/master/file_permissions_ovn_cni_server_sock/tests/ocp4/e2e.yml +++ b/applications/openshift/master/file_permissions_ovn_cni_server_sock/tests/ocp4/e2e.yml @@ -1,3 +1,3 @@ --- -default_result: NOT-APPLICABLE +default_result: PASS diff --git a/applications/openshift/master/file_permissions_ovn_db_files/tests/ocp4/4.12.yml b/applications/openshift/master/file_permissions_ovn_db_files/tests/ocp4/4.12.yml deleted file mode 100644 index a700773455b..00000000000 --- a/applications/openshift/master/file_permissions_ovn_db_files/tests/ocp4/4.12.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -default_result: PASS - diff --git a/applications/openshift/master/file_permissions_ovn_db_files/tests/ocp4/4.13.yml b/applications/openshift/master/file_permissions_ovn_db_files/tests/ocp4/4.13.yml deleted file mode 100644 index a700773455b..00000000000 --- a/applications/openshift/master/file_permissions_ovn_db_files/tests/ocp4/4.13.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -default_result: PASS - diff --git a/applications/openshift/master/file_permissions_ovn_db_files/tests/ocp4/e2e.yml b/applications/openshift/master/file_permissions_ovn_db_files/tests/ocp4/e2e.yml index 26875d6e9f6..a700773455b 100644 --- a/applications/openshift/master/file_permissions_ovn_db_files/tests/ocp4/e2e.yml +++ b/applications/openshift/master/file_permissions_ovn_db_files/tests/ocp4/e2e.yml @@ -1,3 +1,3 @@ --- -default_result: NOT-APPLICABLE +default_result: PASS diff --git a/shared/applicability/oval/installed_app_is_ocp4_node.xml b/shared/applicability/oval/installed_app_is_ocp4_node.xml index f90a38ca9a3..46db94b3ceb 100644 --- a/shared/applicability/oval/installed_app_is_ocp4_node.xml +++ b/shared/applicability/oval/installed_app_is_ocp4_node.xml @@ -24,7 +24,7 @@ - /etc/kubernetes/cni/net.d/00-multus.conf + /var/run/multus/cni/net.d/10-ovn-kubernetes.conf @@ -37,7 +37,7 @@ - .delegates[0].type + .type