Align e2e test timeouts

So that ginkgo times out first and we get useful output.

Signed-off-by: Jaime Caamaño Ruiz <[email protected]>

Author: jcaamano

.github/workflows/test.yml

@@ -616,7 +616,9 @@ jobs:
     - name: Run Tests
       # e2e tests take ~60 minutes normally, 120 should be more than enough
       # set 3 hours for control-plane tests as these might take a while
-      timeout-minutes: ${{ matrix.target == 'control-plane' && 180 || matrix.target == 'control-plane-helm' && 180 || matrix.target == 'external-gateway' && 180 || 120 }}
+      # give 10m extra to give ginkgo chance to timeout before github so that we
+      # get its output
+      timeout-minutes: ${{ matrix.target == 'bgp' && 190 || matrix.target == 'control-plane' && 190 || matrix.target == 'control-plane-helm' && 190 || matrix.target == 'external-gateway' && 190 || 130 }}
       run: |
         # used by e2e diagnostics package
         export OVN_IMAGE="ovn-daemonset-fedora:pr"

test/scripts/e2e-cp.sh

@@ -184,13 +184,18 @@ export NUM_NODES=2
 
 FOCUS=$(echo ${@:1} | sed 's/ /\\s/g')
 
+# Ginkgo test timeout needs to be lower than both github's timeout and go test
+# timeout to be able to get proper Ginkgo output when it happens.
+TEST_TIMEOUT=${TEST_TIMEOUT:-180}
+GO_TEST_TIMEOUT=$((TEST_TIMEOUT + 5))
+
 pushd e2e
 
 go mod download
-go test -test.timeout 180m -v . \
+go test -test.timeout ${GO_TEST_TIMEOUT}m -v . \
         -ginkgo.v \
         -ginkgo.focus ${FOCUS:-.} \
-        -ginkgo.timeout 3h \
+        -ginkgo.timeout ${TEST_TIMEOUT}m \
         -ginkgo.flake-attempts ${FLAKE_ATTEMPTS:-2} \
         -ginkgo.skip="${SKIPPED_TESTS}" \
         -ginkgo.junit-report=${E2E_REPORT_DIR}/junit_${E2E_REPORT_PREFIX}report.xml \

test/scripts/e2e-kind.sh

@@ -200,7 +200,7 @@ fi
 # timeout needs to be lower than github's timeout. Otherwise github terminates
 # the job and doesn't give ginkgo a chance to print status so that we know why
 # the timeout happened.
-TEST_TIMEOUT=${TEST_TIMEOUT:-100m}
+TEST_TIMEOUT=${TEST_TIMEOUT:-120m}
 
 ginkgo --nodes=${NUM_NODES} \
 	--focus=${FOCUS} \