From 33e6384e4831d61f21ad5bfdb131f9a50c4430f9 Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Fri, 11 Oct 2019 09:55:24 -0700 Subject: [PATCH] ci: cleanup test manifests Make sure we cleanup the manifest files at the right spot of the CI process. When not building a PR, behavior is different. Signed-off-by: Anas Nashif --- scripts/ci/run_ci.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/ci/run_ci.sh b/scripts/ci/run_ci.sh index a900837a0ee..d2ba4f280bb 100755 --- a/scripts/ci/run_ci.sh +++ b/scripts/ci/run_ci.sh @@ -149,8 +149,6 @@ function get_tests_to_run() { ./scripts/ci/get_modified_tests.py --commits ${COMMIT_RANGE} > modified_tests.args; ./scripts/ci/get_modified_boards.py --commits ${COMMIT_RANGE} > modified_boards.args; - rm -f test_file.txt - touch test_file_1.txt test_file_2.txt if [ -s modified_boards.args ]; then ${SANITYCHECK} ${SANITYCHECK_OPTIONS} +modified_boards.args --save-tests test_file_1.txt || exit 1; fi @@ -278,6 +276,10 @@ if [ -n "$MAIN_CI" ]; then echo "Skipping west command tests" fi + # cleanup + rm -f test_file.txt + touch test_file_1.txt test_file_2.txt + # In a pull-request see if we have changed any tests or board definitions if [ -n "${PULL_REQUEST_NR}" -o -n "${LOCAL_RUN}" ]; then get_tests_to_run