Merge "[k8s][conformance] Check sonobuoy container runs"

diff --combined tests/k8s/conformance/conformance.robot
index d0da9c6,17f05d3..edd2271
--- 1/tests/k8s/conformance/conformance.robot
--- 2/tests/k8s/conformance/conformance.robot
+++ b/tests/k8s/conformance/conformance.robot
@@@ -24,10 -24,8 +24,10 @@@ Library           Collection
  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
@@@ -40,7 -38,7 +40,7 @@@ ${LOG}            ${LOG_PATH}${/}${SUIT
  &{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}
@@@ -73,6 -71,7 +73,7 @@@ Run Sonobuoy Conformance Tes
          Append To File          ${LOG}  ${output}${\n}
  
          # Wait until the test finishes execution
+         Wait Until Keyword Succeeds    3x    20 sec    Check that sonobuoy is running
          Run                     while sonobuoy status | grep "Sonobuoy is still running"; do sleep 180; done
          Append To File          ${LOG}  "Sonobuoy has completed"${\n}
  
@@@ -93,6 -92,10 +94,10 @@@ Check that k8s cluster is reachabl
          Append To File          ${LOG}  ${output}${\n}
          Should Contain          ${output}      Server Version: version.Info
  
+ Check that sonobuoy is running
+        ${output}=              Run    kubectl get pod sonobuoy --namespace sonobuoy
+        Should Contain          ${output}     Running
+ 
  Cleanup Sonobuoy
          ${rc}  ${output}=       Run And Return Rc And Output
                                  ...  kubectl delete -f ${CURDIR}${/}sonobuoy.yaml
@@@ -137,14 -140,6 +142,14 @@@ Onboard Kubernetes e2e Test Image
              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}