X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=tests%2Fk8s%2Fconformance%2Fconformance.robot;h=ffffd7782d9019e10000d96b8f5e306a99e2fe10;hb=HEAD;hp=c51f217a6098ac29be5a752b3efdd94ae1de9e12;hpb=528222a0d0fff5208e298548a567f3a63ef4358a;p=validation.git

diff --git a/tests/k8s/conformance/conformance.robot b/tests/k8s/conformance/conformance.robot
index c51f217..ffffd77 100644
--- a/tests/k8s/conformance/conformance.robot
+++ b/tests/k8s/conformance/conformance.robot
@@ -37,15 +37,12 @@ Test Teardown     Run Keywords
 *** Variables ***
 ${LOG}            ${LOG_PATH}${/}${SUITE_NAME.replace(' ','_')}.log
 
-&{SONOBUOY}         path=gcr.io/heptio-images
-...                 name=sonobuoy:v0.16.1
-&{E2E}              path=akraino
+&{SONOBUOY}         path=sonobuoy
+...                 name=sonobuoy:v0.18.2
+&{E2E}              path=k8s.gcr.io
 ...                 name=Actual value set dynamically
-&{SYSTEMD_LOGS}     path=akraino
-...                 name=validation:sonobuoy-plugin-systemd-logs-latest
 &{SONOBUOY_IMGS}    sonobuoy=&{SONOBUOY}
 ...                 e2e=&{E2E}
-...                 systemd_logs=&{SYSTEMD_LOGS}
 
 # Following tests assume DNS domain is "cluster.local"
 ${DNS_DOMAIN_TESTS}  SEPARATOR=
@@ -146,11 +143,8 @@ 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
-        ${major}=               Get Regexp Matches  ${major[0]}  \\d+
-        ${minor}=               Get Regexp Matches  ${minor[0]}  \\d+
-        Set To Dictionary       ${SONOBUOY_IMGS['e2e']}  name=validation:kube-conformance-v${major[0]}.${minor[0]}
+        ${gitVersion}=          Get Value From Json  ${versions}  $.serverVersion.gitVersion
+        Set To Dictionary       ${SONOBUOY_IMGS['e2e']}  name=conformance:${gitVersion[0]}
 
 Onboard Images
         ${INT_REG}=             Get Variable Value  ${INTERNAL_REGISTRY}  ${EMPTY}
@@ -185,7 +179,4 @@ Create Manifest File
         ...                         ${CURDIR}${/}custom_repos.yaml
         ${result}=              Run Process  sonobuoy  gen  @{flags}
         Should Be Equal As Integers  ${result.rc}  0
-        ${manifest}=            Replace String  ${result.stdout}
-        ...                         image: gcr.io/heptio-images/sonobuoy-plugin-systemd-logs:latest
-        ...                         image: ${SONOBUOY_IMGS.systemd_logs.path}/${SONOBUOY_IMGS.systemd_logs.name}
-        Create File             ${CURDIR}${/}sonobuoy.yaml  ${manifest}
+        Create File             ${CURDIR}${/}sonobuoy.yaml  ${result.stdout}