michaelh/zephyr
1
0
Fork 0
Code Releases Activity

ci: cleanup test manifests

Browse source 
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 <anas.nashif@intel.com>
This commit is contained in:
Anas Nashif 2019-10-11 09:55:24 -07:00 • committed by Carles Cufí
commit 33e6384e48
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
scripts/ci/run_ci.sh
View file

@ -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_tests.py --commits ${COMMIT_RANGE} > modified_tests.args;
./scripts/ci/get_modified_boards.py --commits ${COMMIT_RANGE} > modified_boards.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 if [ -s modified_boards.args ]; then
${SANITYCHECK} ${SANITYCHECK_OPTIONS} +modified_boards.args --save-tests test_file_1.txt || exit 1; ${SANITYCHECK} ${SANITYCHECK_OPTIONS} +modified_boards.args --save-tests test_file_1.txt || exit 1;
fi fi
@ -278,6 +276,10 @@ if [ -n "$MAIN_CI" ]; then
echo "Skipping west command tests" echo "Skipping west command tests"
fi 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 # In a pull-request see if we have changed any tests or board definitions
if [ -n "${PULL_REQUEST_NR}" -o -n "${LOCAL_RUN}" ]; then if [ -n "${PULL_REQUEST_NR}" -o -n "${LOCAL_RUN}" ]; then
get_tests_to_run get_tests_to_run