From b33085fbe049be80ea9a3a3b525d490d19d9e5f7 Mon Sep 17 00:00:00 2001 From: MrKevinWeiss Date: Wed, 3 Aug 2022 09:56:42 +0200 Subject: [PATCH 1/5] test 20 repeats of known flakey test --- .murdock | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.murdock b/.murdock index b82d30a0b9df..3f18bebb6d89 100755 --- a/.murdock +++ b/.murdock @@ -3,7 +3,7 @@ # uncomment and change this to limit builds, e.g., #export BOARDS="samr21-xpro native" # and / or -#export APPS="examples/hello-world tests/unittests" +export APPS="tests/pkg_cryptoauthlib_internal-tests" # : ${TEST_BOARDS_AVAILABLE:="esp32-wroom-32 samr21-xpro"} @@ -425,6 +425,17 @@ test_cache_put() { # compile one app for one board with one toolchain. delete intermediates. compile() { + for i in $(seq 1 20); do + echo "==========================================" + echo $i + _compile $1 $2 + if [ $? -ne 0 ]; then + break + fi + done + return $? +} +_compile() { local appdir=$1 local board=$(echo $2 | cut -f 1 -d':') local toolchain=$(echo $2 | cut -f 2 -d':') From ad7fafccc4f82abf24e5a6b9d4535228a6e8f09b Mon Sep 17 00:00:00 2001 From: MrKevinWeiss Date: Wed, 3 Aug 2022 10:04:57 +0200 Subject: [PATCH 2/5] Timeout due to high compilation time Now trying to multiply by 200 submitted jobs using the get_app_board_toolchain_pairs --- .murdock | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/.murdock b/.murdock index 3f18bebb6d89..a6dfba373c7c 100755 --- a/.murdock +++ b/.murdock @@ -377,7 +377,10 @@ get_app_board_toolchain_pairs() { do for toolchain in $(get_supported_toolchains $appdir $board) do - echo $prefix $appdir $board:$toolchain + for for i in $(seq 1 200) + do + echo $prefix $appdir $board:$toolchain + done done done | $(_greplist $BOARDS) } @@ -425,17 +428,6 @@ test_cache_put() { # compile one app for one board with one toolchain. delete intermediates. compile() { - for i in $(seq 1 20); do - echo "==========================================" - echo $i - _compile $1 $2 - if [ $? -ne 0 ]; then - break - fi - done - return $? -} -_compile() { local appdir=$1 local board=$(echo $2 | cut -f 1 -d':') local toolchain=$(echo $2 | cut -f 2 -d':') From 1791011afd5cc18a96060d45885813e29acc173e Mon Sep 17 00:00:00 2001 From: MrKevinWeiss Date: Thu, 4 Aug 2022 11:41:56 +0200 Subject: [PATCH 3/5] fixup! Timeout due to high compilation time --- .murdock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.murdock b/.murdock index a6dfba373c7c..67a53da0a4f8 100755 --- a/.murdock +++ b/.murdock @@ -377,7 +377,7 @@ get_app_board_toolchain_pairs() { do for toolchain in $(get_supported_toolchains $appdir $board) do - for for i in $(seq 1 200) + for i in $(seq 1 200) do echo $prefix $appdir $board:$toolchain done From f4012bc8674b3744c899cf69fa825d04ad586013 Mon Sep 17 00:00:00 2001 From: MrKevinWeiss Date: Tue, 9 Aug 2022 08:52:53 +0200 Subject: [PATCH 4/5] disable ccache --- .murdock | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/.murdock b/.murdock index 67a53da0a4f8..52a141c51415 100755 --- a/.murdock +++ b/.murdock @@ -461,29 +461,21 @@ compile() { if get_supported_kconfig_board_app "${board}" "${appdir}"; then should_check_kconfig_hash=1 - # As we have some issues with occasional unrelated hash mismatches - # we will stop the binary checks and rely only in a module/package - # check to ensure kconfig is matching make. - # Only nightlies will check the hash... - # Once we figure out the problem we can check the hashes again or - # better yet just finish! - if [ ${NIGHTLY} -eq 1 ]; then - BOARD=${board} make -C${appdir} clean - CCACHE_BASEDIR="$(pwd)" BOARD=${board} TOOLCHAIN=${toolchain} RIOT_CI_BUILD=1 TEST_KCONFIG=1 \ - make -C${appdir} all test-input-hash -j${JOBS:-4} - RES=$? - if [ $RES -eq 0 ]; then - kconfig_hashes="$(cat ${BINDIR}/test-input-hash.sha1)" - else - kconfig_hashes="kconfig-build-failed" - echo "An error occurred while compiling using Kconfig"; - fi + BOARD=${board} make -C${appdir} clean + CCACHE_DISABLE=1 CCACHE_BASEDIR="$(pwd)" BOARD=${board} TOOLCHAIN=${toolchain} RIOT_CI_BUILD=1 TEST_KCONFIG=1 \ + make -C${appdir} all test-input-hash -j${JOBS:-4} + RES=$? + if [ $RES -eq 0 ]; then + kconfig_hashes="$(cat ${BINDIR}/test-input-hash.sha1)" + else + kconfig_hashes="kconfig-build-failed" + echo "An error occurred while compiling using Kconfig"; fi fi # compile without Kconfig BOARD=${board} make -C${appdir} clean - CCACHE_BASEDIR="$(pwd)" BOARD=$board TOOLCHAIN=$toolchain RIOT_CI_BUILD=1 \ + CCACHE_DISABLE=1 CCACHE_BASEDIR="$(pwd)" BOARD=$board TOOLCHAIN=$toolchain RIOT_CI_BUILD=1 \ make -C${appdir} all test-input-hash -j${JOBS:-4} RES=$? From f132ebf12eac9d653cb5f3b8616beda32aaab073 Mon Sep 17 00:00:00 2001 From: MrKevinWeiss Date: Thu, 25 Aug 2022 10:50:10 +0200 Subject: [PATCH 5/5] rebase and do 300 --- .murdock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.murdock b/.murdock index 52a141c51415..f05088f8000d 100755 --- a/.murdock +++ b/.murdock @@ -377,7 +377,7 @@ get_app_board_toolchain_pairs() { do for toolchain in $(get_supported_toolchains $appdir $board) do - for i in $(seq 1 200) + for i in $(seq 1 300) do echo $prefix $appdir $board:$toolchain done