From 679529ccb41421385b5b03afbe701ac7bb745685 Mon Sep 17 00:00:00 2001 From: Tommaso Pecorella Date: Tue, 9 May 2023 17:35:15 +0200 Subject: [PATCH] ci: fix missing tests in some daily jobs --- utils/tests/gitlab-ci-daily.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/utils/tests/gitlab-ci-daily.yml b/utils/tests/gitlab-ci-daily.yml index 56eed0f24..112e6588e 100644 --- a/utils/tests/gitlab-ci-daily.yml +++ b/utils/tests/gitlab-ci-daily.yml @@ -22,8 +22,10 @@ - export CCACHE_DIR=${PWD}/$CCACHE_BASEDIR_VALUE # missing the flag --disable-python - ./ns3 configure -d $MODE -GNinja --enable-examples --enable-tests --disable-gtk - - ./ns3 build - - if [ "$CI_JOB_STAGE" == "test" ]; + - if [[ "$CI_JOB_STAGE" == "build" ]]; + then ./ns3 build; + fi + - if [[ "$CI_JOB_STAGE" == "test" ]] || [[ "$FORCE_TESTS" == "True" ]]; then ./test.py -n $VALGRIND_FLAG $FULLNESS; fi cache: @@ -140,6 +142,7 @@ daily-build-test-optimized-valgrind: variables: MODE: optimized VALGRIND_FLAG: -g + FORCE_TESTS: Force tags: - nsnam - linux @@ -156,6 +159,7 @@ weekly-build-test-debug-valgrind: variables: MODE: debug VALGRIND_FLAG: -g + FORCE_TESTS: Force tags: - nsnam - linux @@ -172,6 +176,7 @@ weekly-build-test-default-valgrind: variables: MODE: default VALGRIND_FLAG: -g + FORCE_TESTS: Force tags: - nsnam - linux @@ -188,6 +193,7 @@ weekly-build-test-optimized-valgrind: variables: MODE: optimized VALGRIND_FLAG: -g + FORCE_TESTS: Force tags: - nsnam - linux @@ -204,6 +210,7 @@ weekly-build-test-takes-forever-optimized: variables: MODE: optimized FULLNESS: "-f TAKES_FOREVER" + FORCE_TESTS: Force tags: - nsnam - linux