From 8d5e0254bc8c9e2f956029b5b0ab63f46be1b1a8 Mon Sep 17 00:00:00 2001 From: Calen Pennington Date: Fri, 4 Aug 2017 15:08:00 -0400 Subject: [PATCH 1/2] Write test output to logs, rather than to stdout to avoid blowing up jenkins --- scripts/generic-ci-tests.sh | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/scripts/generic-ci-tests.sh b/scripts/generic-ci-tests.sh index ea87a18ebd..cb6dfef87a 100755 --- a/scripts/generic-ci-tests.sh +++ b/scripts/generic-ci-tests.sh @@ -68,6 +68,8 @@ function emptyxunit { END } +PAVER_ARGS="--with-flaky --cov-args='-p' --with-xunitmp -v" +PARALLEL="--processes=-1" case "$TEST_SUITE" in "quality") @@ -99,16 +101,15 @@ case "$TEST_SUITE" in ;; "lms-unit") - PAVER_ARGS="--with-flaky --processes=-1 --cov-args='-p' --with-xunitmp" case "$SHARD" in "all") - paver test_system -s lms $PAVER_ARGS + paver test_system -s lms $PAVER_ARGS $PARALLEL 2> lms-tests.log ;; [1-3]) - paver test_system -s lms --attr="shard=$SHARD" $PAVER_ARGS + paver test_system -s lms --attr="shard=$SHARD" $PAVER_ARGS $PARALLEL 2> lms-tests.$SHARD.log ;; 4|"noshard") - paver test_system -s lms --attr='!shard' $PAVER_ARGS + paver test_system -s lms --attr='!shard' $PAVER_ARGS $PARALLEL 2> lms-tests.REST.log ;; *) # If no shard is specified, rather than running all tests, create an empty xunit file. This is a @@ -122,11 +123,11 @@ case "$TEST_SUITE" in ;; "cms-unit") - paver test_system -s cms --with-flaky --cov-args="-p" -v --with-xunitmp + paver test_system -s cms $PAVER_ARGS 2> cms-tests.log ;; "commonlib-unit") - paver test_lib --with-flaky --cov-args="-p" -v --with-xunit + paver test_lib $PAVER_ARGS 2> common-tests.log ;; "js-unit") @@ -136,7 +137,7 @@ case "$TEST_SUITE" in "commonlib-js-unit") paver test_js --coverage --skip-clean || { EXIT=1; } - paver test_lib --skip-clean --with-flaky --cov-args="-p" --with-xunitmp || { EXIT=1; } + paver test_lib --skip-clean $PAVER_ARGS || { EXIT=1; } # This is to ensure that the build status of the shard is properly set. # Because we are running two paver commands in a row, we need to capture From 04e67b819cea9a2d8ddd2e399afa626306a31d59 Mon Sep 17 00:00:00 2001 From: Calen Pennington Date: Wed, 23 Aug 2017 11:40:18 -0400 Subject: [PATCH 2/2] fixup! Write test output to logs, rather than to stdout to avoid blowing up jenkins --- scripts/generic-ci-tests.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/generic-ci-tests.sh b/scripts/generic-ci-tests.sh index cb6dfef87a..cc94990569 100755 --- a/scripts/generic-ci-tests.sh +++ b/scripts/generic-ci-tests.sh @@ -68,7 +68,7 @@ function emptyxunit { END } -PAVER_ARGS="--with-flaky --cov-args='-p' --with-xunitmp -v" +PAVER_ARGS="--cov-args='-p' --with-xunitmp -v" PARALLEL="--processes=-1" case "$TEST_SUITE" in @@ -109,7 +109,7 @@ case "$TEST_SUITE" in paver test_system -s lms --attr="shard=$SHARD" $PAVER_ARGS $PARALLEL 2> lms-tests.$SHARD.log ;; 4|"noshard") - paver test_system -s lms --attr='!shard' $PAVER_ARGS $PARALLEL 2> lms-tests.REST.log + paver test_system -s lms --attr='!shard' $PAVER_ARGS $PARALLEL 2> lms-tests.4.log ;; *) # If no shard is specified, rather than running all tests, create an empty xunit file. This is a