X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=tests%2Fk8s%2Fconformance%2Fconformance.robot;fp=tests%2Fk8s%2Fconformance%2Fconformance.robot;h=0d0c00255eddd9995021376ccdc581b6906bc248;hb=1af9a1f37c2e32f4ef007a97ed710d5bf8b5a9cf;hp=9418772ed0ae2546e6eac5537168fc2908ff08dc;hpb=ce060c9f65de5c231d2bf6c0e3bbdf9dce7ab7d4;p=validation.git

diff --git a/tests/k8s/conformance/conformance.robot b/tests/k8s/conformance/conformance.robot
index 9418772..0d0c002 100644
--- a/tests/k8s/conformance/conformance.robot
+++ b/tests/k8s/conformance/conformance.robot
@@ -45,6 +45,13 @@ ${LOG}            ${LOG_PATH}${/}${SUITE_NAME.replace(' ','_')}.log
 ...                 e2e=&{E2E}
 ...                 systemd_logs=&{SYSTEMD_LOGS}
 
+# Following tests assume DNS domain is "cluster.local"
+${DNS_DOMAIN_TESTS}  SEPARATOR=
+...                 DNS should provide /etc/hosts entries for the cluster|
+...                 DNS should provide DNS for services|
+...                 DNS should provide DNS for ExternalName services|
+...                 DNS should provide DNS for the cluster
+
 *** Test Cases ***
 Run Sonobuoy Conformance Test
         # Start the test
@@ -126,10 +133,19 @@ Onboard Images
         Onboard Sonobuoy Images
         Onboard Kubernetes e2e Test Images
 
+Get Tests To Skip
+        ${flag}=                Set Variable  Aggregator|Alpha|\\[(Disruptive|Feature:[^\\]]+|Flaky)\\]
+        ${flag}=                Run Keyword If  '${DNS_DOMAIN}' != 'cluster.local'
+        ...                         Catenate  SEPARATOR=|  ${flag}  ${DNS_DOMAIN_TESTS}
+        ...                     ELSE
+        ...                         Set Variable  ${flag}
+        [Return]                ${flag}
+
 Create Manifest File
+        ${skip}=                Get Tests To Skip
         @{flags}=               Set Variable
         ...                         --e2e-focus  \\[Conformance\\\]
-        ...                         --e2e-skip  Aggregator|Alpha|\\[(Disruptive|Feature:[^\\]]+|Flaky)\\]
+        ...                         --e2e-skip  ${skip}
         ...                         --kube-conformance-image  ${SONOBUOY_IMGS.e2e.path}/${SONOBUOY_IMGS.e2e.name}
         ...                         --sonobuoy-image  ${SONOBUOY_IMGS.sonobuoy.path}/${SONOBUOY_IMGS.sonobuoy.name}
         ...                         --image-pull-policy  Always