From 1af9a1f37c2e32f4ef007a97ed710d5bf8b5a9cf Mon Sep 17 00:00:00 2001
From: Juha Kosonen <juha.kosonen@nokia.com>
Date: Tue, 8 Oct 2019 13:47:22 +0300
Subject: [PATCH] Skip DNS domain tests

For the time being do not execute e2e tests which assume fixed domain
name [1] conflicting cluster's domain name. Configurability has
been implemented [2] but available only starting from k8s 1.16.

[1] https://github.com/vmware-tanzu/sonobuoy/issues/733
[2] https://github.com/kubernetes/kubernetes/pull/79284

JIRA: VAL-61

Signed-off-by: Juha Kosonen <juha.kosonen@nokia.com>
Change-Id: I9b13dc7a402b3304b2b22a33a6eb8e446d3abcc6
---
 tests/k8s/conformance/conformance.robot | 18 +++++++++++++++++-
 tests/variables.yaml                    |  1 +
 2 files changed, 18 insertions(+), 1 deletion(-)

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
diff --git a/tests/variables.yaml b/tests/variables.yaml
index 121eb26..11e8779 100644
--- a/tests/variables.yaml
+++ b/tests/variables.yaml
@@ -58,3 +58,4 @@ rootpswd: rootpassword   # Required root password to log in to the host
 
 ### Input variables for Conformance test
 internal_registry: ''                         # Docker internal registry
+dns_domain: cluster.local                     # cluster's DNS domain
-- 
2.16.6