Merge pull request #3442 from ggiguash/4.16_cncf_timeout

[release-4.16] USHIFT-3266 Increase cncf result collection timeout to 10m

Author: openshift-merge-bot[bot]

test/scenarios-periodics/[email protected]

@@ -5,7 +5,7 @@
 KUBECONFIG="${SCENARIO_INFO_DIR}/${SCENARIO}/kubeconfig"
 # Timeout in seconds
 TIMEOUT_TEST=7400
-TIMEOUT_RESULTS=300
+TIMEOUT_RESULTS=600
 
 prepare_hosts() {
     local -r primary_host_ip=$(cat "${SCENARIO_INFO_DIR}/${SCENARIO}/vms/host1/public_ip")
@@ -93,7 +93,7 @@ run_sonobuoy() {
     fi
     record_junit "run_sonobuoy" "wait_e2e_running" "OK"
 
-    # Use 1h timeout. A normal run on 2 CPUs takes 40-45min.
+    # Note that a normal run on 2 CPUs takes 40-45min.
     local -r stat_file="${SCENARIO_INFO_DIR}/${SCENARIO}/cncf_status.json"
     start=$(date +%s)
     while true ; do
@@ -105,7 +105,7 @@ run_sonobuoy() {
         now=$(date +%s)
         if [ $(( now - start )) -ge ${TIMEOUT_TEST} ]; then
             rc=1
-            echo "Tests running for 1h. Timing out"
+            echo "Tests running for ${TIMEOUT_TEST}s. Timing out"
             record_junit "run_sonobuoy" "wait_e2e_finished" "FAILED"
             break
         fi
@@ -126,7 +126,7 @@ run_sonobuoy() {
         if [ $(( now - start )) -ge ${TIMEOUT_RESULTS} ]; then
             rc=1
             results=false
-            echo "Waited for results for 5m. Timing out"
+            echo "Waited for results for ${TIMEOUT_RESULTS}s. Timing out"
             record_junit "run_sonobuoy" "wait_e2e_results" "FAILED"
             break
         fi