From e41f323e616eb50c8546d895473a5f82789f36d5 Mon Sep 17 00:00:00 2001
From: Juha Kosonen <juha.kosonen@nokia.com>
Date: Thu, 7 Nov 2019 15:10:50 +0200
Subject: [PATCH] Select kube-conformance version dynamically

Use a version conformorming server version.

Change-Id: Ib2d82c810fe82da3825f0d1b63345d1fa0baf6ff
Signed-off-by: Juha Kosonen <juha.kosonen@nokia.com>
---
 docker/k8s/pip-requirements.txt         |  1 +
 tests/k8s/conformance/conformance.robot | 12 +++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/docker/k8s/pip-requirements.txt b/docker/k8s/pip-requirements.txt
index 6139a45..18b264c 100644
--- a/docker/k8s/pip-requirements.txt
+++ b/docker/k8s/pip-requirements.txt
@@ -1,4 +1,5 @@
 robotframework
 robotframework-httplibrary
+robotframework-jsonlibrary
 robotframework-requests
 robotframework-sshlibrary
diff --git a/tests/k8s/conformance/conformance.robot b/tests/k8s/conformance/conformance.robot
index 45965c7..d0da9c6 100644
--- a/tests/k8s/conformance/conformance.robot
+++ b/tests/k8s/conformance/conformance.robot
@@ -24,8 +24,10 @@ Library           Collections
 Library           String
 Library           SSHLibrary
 Library           Process
+Library           JSONLibrary
 Test Setup        Run Keywords
 ...               Check that k8s cluster is reachable
+...               Define Images
 ...               Onboard Images
 ...               Create Manifest File
 Test Teardown     Run Keywords
@@ -38,7 +40,7 @@ ${LOG}            ${LOG_PATH}${/}${SUITE_NAME.replace(' ','_')}.log
 &{SONOBUOY}         path=gcr.io/heptio-images
 ...                 name=sonobuoy:v0.16.1
 &{E2E}              path=akraino
-...                 name=validation:kube-conformance-v1.16
+...                 name=Actual value set dynamically
 &{SYSTEMD_LOGS}     path=akraino
 ...                 name=validation:sonobuoy-plugin-systemd-logs-latest
 &{SONOBUOY_IMGS}    sonobuoy=&{SONOBUOY}
@@ -135,6 +137,14 @@ Onboard Kubernetes e2e Test Images
             Upload To Internal Registry  ${path}  ${name}
         END
 
+Define Images
+        ${result}=              Run Process  kubectl  version  -o  json
+        Should Be Equal As Integers  ${result.rc}  0
+        ${versions}=            Convert String To JSON  ${result.stdout}
+        ${major}=               Get Value From Json  ${versions}  $.serverVersion.major
+        ${minor}=               Get Value From Json  ${versions}  $.serverVersion.minor
+        Set To Dictionary       ${SONOBUOY_IMGS['e2e']}  name=validation:kube-conformance-v${major[0]}.${minor[0]}
+
 Onboard Images
         ${INT_REG}=             Get Variable Value  ${INTERNAL_REGISTRY}  ${EMPTY}
         Set Test Variable       ${INT_REG}
-- 
2.16.6