Skip to content

Commit

Permalink
Makefile: add -timeout argument to e2e-tests
Browse files Browse the repository at this point in the history
Fixes recently experienced timeouts in e2e-tests. For some reason
-test.timeout was not enough (anymore).
  • Loading branch information
marquiz committed Dec 21, 2023
1 parent 03f1f75 commit b49fcc5
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,8 @@ test:

e2e-test:
@if [ -z ${KUBECONFIG} ]; then echo "[ERR] KUBECONFIG missing, must be defined"; exit 1; fi
$(GO_CMD) test -v ./test/e2e/ -args -nfd.repo=$(IMAGE_REPO) -nfd.tag=$(IMAGE_TAG_NAME) \
$(GO_CMD) test -timeout=1h -v ./test/e2e/ -args \
-nfd.repo=$(IMAGE_REPO) -nfd.tag=$(IMAGE_TAG_NAME) \
-kubeconfig=$(KUBECONFIG) \
-nfd.e2e-config=$(E2E_TEST_CONFIG) \
-nfd.pull-if-not-present=$(E2E_PULL_IF_NOT_PRESENT) \
Expand All @@ -204,7 +205,8 @@ e2e-test:
-test.timeout=1h \
$(if $(OPENSHIFT),-nfd.openshift,)
if [ "$(E2E_TEST_FULL_IMAGE)" = "true" ]; then \
$(GO_CMD) test -v ./test/e2e/ -args -nfd.repo=$(IMAGE_REPO) -nfd.tag=$(IMAGE_TAG_NAME)-full \
$(GO_CMD) test -timeout=1h -v ./test/e2e/ -args \
-nfd.repo=$(IMAGE_REPO) -nfd.tag=$(IMAGE_TAG_NAME)-full \
-kubeconfig=$(KUBECONFIG) \
-nfd.e2e-config=$(E2E_TEST_CONFIG) \
-nfd.pull-if-not-present=$(E2E_PULL_IF_NOT_PRESENT) \
Expand Down

0 comments on commit b49fcc5

Please sign in to comment.