From 29017b48d364bcbb52b8a316f75c506cb3c9d34a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alexander=20K=C3=B6plinger?= Date: Sat, 2 Sep 2017 00:10:40 +0200 Subject: [PATCH] [ci] Retry flaky tests only on PRs (#5492) So we can still see failures in master and release branches. --- external/nunit-lite | 2 +- scripts/ci/run-jenkins.sh | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/external/nunit-lite b/external/nunit-lite index 5b29e610f4a..764656cdafd 160000 --- a/external/nunit-lite +++ b/external/nunit-lite @@ -1 +1 @@ -Subproject commit 5b29e610f4ac95afcb8108fdd6d0bb1936f6cc83 +Subproject commit 764656cdafdb3acd25df8cb52a4e0ea14760fccd diff --git a/scripts/ci/run-jenkins.sh b/scripts/ci/run-jenkins.sh index fcc26b7eff6..bdecfae3efb 100755 --- a/scripts/ci/run-jenkins.sh +++ b/scripts/ci/run-jenkins.sh @@ -29,6 +29,10 @@ else export CFLAGS="-ggdb3 -O2" fi +if [[ $CI_TAGS == *'retry-flaky-tests'* ]]; then + export MONO_FLAKY_TEST_RETRIES=5 +fi + if [[ ${label} == 'osx-i386' ]]; then EXTRA_CONF_FLAGS="${EXTRA_CONF_FLAGS} --with-libgdiplus=/Library/Frameworks/Mono.framework/Versions/Current/lib/libgdiplus.dylib --build=i386-apple-darwin11.2.0"; fi if [[ ${label} == 'osx-amd64' ]]; then EXTRA_CONF_FLAGS="${EXTRA_CONF_FLAGS} --with-libgdiplus=/Library/Frameworks/Mono.framework/Versions/Current/lib/libgdiplus.dylib "; fi if [[ ${label} == 'w32' ]]; then PLATFORM=Win32; EXTRA_CONF_FLAGS="${EXTRA_CONF_FLAGS} --host=i686-w64-mingw32"; export MONO_EXECUTABLE="${MONO_REPO_ROOT}/msvc/build/sgen/Win32/bin/Release/mono-sgen.exe"; fi -- 2.25.1