From: Juha Kosonen <juha.kosonen@nokia.com>
Date: Tue, 5 Nov 2019 10:57:55 +0000 (+0200)
Subject: Update conformance test to support k8s 1.16
X-Git-Tag: 2.0.0~5^2
X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=validation.git;a=commitdiff_plain;h=b233e38c4f9c73cf5c5c37e73dfc381d9f87f063

Update conformance test to support k8s 1.16

- Sonobuoy v0.16.1
- kube-conformance 1.16

JIRA: VAL-84

Change-Id: I63bf582466c6447326c67a0c4faffdcab496acad
Signed-off-by: Juha Kosonen <juha.kosonen@nokia.com>
---

diff --git a/docker/README.rst b/docker/README.rst
index 6e0cc7d..0fff3ed 100644
--- a/docker/README.rst
+++ b/docker/README.rst
@@ -231,7 +231,7 @@ Example:
 
 .. code-block:: console
 
-    docker run -ti akraino/validation:kube-conformance-v1.15
+    docker run -ti akraino/validation:kube-conformance-v1.16
 
 By default, the container will run the `run_e2e.sh` script. If you want to
 enter the container, add */bin/sh* at the end of the command above
diff --git a/docker/k8s/Dockerfile b/docker/k8s/Dockerfile
index 925ac3d..43c6d80 100644
--- a/docker/k8s/Dockerfile
+++ b/docker/k8s/Dockerfile
@@ -19,9 +19,9 @@ FROM golang:alpine3.9 as build
 
 # Sonobuoy supports 3 Kubernetes minor versions: the current release and 2
 # minor versions before.
-ARG SB_TAG=v0.15.1
+ARG SB_TAG=v0.16.1
 # Determine the latest stable git tag at build time based on stable major version
-ARG K8S_VER=1.15
+ARG K8S_VER=1.16
 
 # Install dependencies
 COPY pip-requirements.txt /wheels/requirements/pip-requirements.txt
diff --git a/docker/kube-conformance/Makefile b/docker/kube-conformance/Makefile
index 8e76e14..ee7b40f 100644
--- a/docker/kube-conformance/Makefile
+++ b/docker/kube-conformance/Makefile
@@ -15,7 +15,7 @@
 ##############################################################################
 
 export WORK_DIR?=$(TAG_PRE)
-export KUBE_VERSION=1.15
+export KUBE_VERSION=1.16
 export TAG_VER?=v$(KUBE_VERSION)
 
 .PHONY: .build
diff --git a/tests/k8s/conformance/conformance.robot b/tests/k8s/conformance/conformance.robot
index 2c9d3ee..3f2f1eb 100644
--- a/tests/k8s/conformance/conformance.robot
+++ b/tests/k8s/conformance/conformance.robot
@@ -36,9 +36,9 @@ Test Teardown     Run Keywords
 ${LOG}            ${LOG_PATH}${/}${SUITE_NAME.replace(' ','_')}.log
 
 &{SONOBUOY}         path=gcr.io/heptio-images
-...                 name=sonobuoy:v0.15.1
+...                 name=sonobuoy:v0.16.1
 &{E2E}              path=akraino
-...                 name=validation:kube-conformance-v1.15
+...                 name=validation:kube-conformance-v1.16
 &{SYSTEMD_LOGS}     path=akraino
 ...                 name=validation:sonobuoy-plugin-systemd-logs-latest
 &{SONOBUOY_IMGS}    sonobuoy=&{SONOBUOY}
@@ -50,7 +50,16 @@ ${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
+...                 DNS should provide DNS for the cluster|
+...                 DNS should provide DNS for pods for Subdomain|
+...                 DNS should provide DNS for pods for Hostname
+
+# Images listed by Sonobuoy but not available for downloading
+@{SKIP_IMGS}        gcr.io/kubernetes-e2e-test-images/windows-nanoserver:v1
+...                 gcr.io/authenticated-image-pulling/windows-nanoserver:v1
+...                 gcr.io/authenticated-image-pulling/alpine:3.7
+...                 k8s.gcr.io/invalid-image:invalid-tag
+...                 invalid.com/invalid/alpine:3.1
 
 *** Test Cases ***
 Run Sonobuoy Conformance Test
@@ -58,7 +67,7 @@ Run Sonobuoy Conformance Test
         Run                     kubectl apply -f ${CURDIR}${/}sonobuoy.yaml
         Sleep                   20s
         ${rc}  ${output}=       Run And Return Rc And Output
-                                ...  kubectl describe pod/sonobuoy -n heptio-sonobuoy
+                                ...  kubectl describe pod/sonobuoy -n sonobuoy
         Append To File          ${LOG}  ${output}${\n}
 
         # Wait until the test finishes execution
@@ -121,6 +130,7 @@ Onboard Kubernetes e2e Test Images
         Should Be Equal As Integers  ${result.rc}  0
         @{images}=              Split String  ${result.stdout}
         FOR  ${img}  IN  @{images}
+            Continue For Loop If  $img in $SKIP_IMGS
             ${path}  ${name}  Split String From Right  ${img}  /  1
             Upload To Internal Registry  ${path}  ${name}
         END