Merge "[RECV-94] Separate docker/robot invoking"

[validation.git] / tests / k8s / conformance / conformance.robot

diff --git a/tests/k8s/conformance/conformance.robot b/tests/k8s/conformance/conformance.robot
index a18b56a..6f9096c 100644 (file)
--- a/tests/k8s/conformance/conformance.robot
+++ b/tests/k8s/conformance/conformance.robot
@@ -24,26 +24,24 @@ Test Setup        Check that k8s cluster is reachable
 Test Teardown     Cleanup Sonobuoy
 
 *** Variables ***
-${RESULT_PATH}    /opt/akraino/validation/results/conformance/
-${REPO_PATH}      /opt/akraino/validation/repo/conformance/
-${LOG}            ${RESULT_PATH}${/}conformance.log
+${LOG}            ${LOG_PATH}${/}${SUITE_NAME.replace(' ','_')}.log
 
 *** Test Cases ***
 Run Sonobuoy Conformance Test
         # Start the test
-        Run                     kubectl apply -f ${REPO_PATH}${/}sonobuoy.yaml
-        Sleep                   5s
+        Run                     kubectl apply -f ${CURDIR}${/}sonobuoy.yaml
+        Sleep                   10s
         ${rc}  ${output}=       Run And Return Rc And Output
                                 ...  kubectl describe pod/sonobuoy -n heptio-sonobuoy
         Append To File          ${LOG}  ${output}${\n}
 
         # Wait until the test finishes execution
-        Run                     until sonobuoy status | grep "Sonobuoy has completed"; do sleep 120; done
+        Run                     while sonobuoy status | grep "Sonobuoy is still running"; do sleep 180; done
         Append To File          ${LOG}  "Sonobuoy has completed"${\n}
 
         # Get the result and store the sonobuoy logs
         ${rc}  ${output}=       Run And Return Rc And Output
-                                ...  results=$(sonobuoy retrieve ${RESULT_PATH}) && sonobuoy e2e $results
+                                ...  results=$(sonobuoy retrieve ${LOG_PATH}) && sonobuoy e2e $results
         Append To File          ${LOG}  ${output}${\n}
         Should Contain          ${output}       failed tests: 0
 
@@ -60,7 +58,7 @@ Check that k8s cluster is reachable
 
 Cleanup Sonobuoy
         ${rc}  ${output}=       Run And Return Rc And Output
-                                ...  kubectl delete -f ${REPO_PATH}${/}sonobuoy.yaml
+                                ...  kubectl delete -f ${CURDIR}${/}sonobuoy.yaml
         Append To File          ${LOG}  ${output}${\n}
         Sleep                   3s
         Should Contain          ${output}      service "sonobuoy-master" deleted