diff --git a/.travis.yml b/.travis.yml index 24674cb8..4e0ba7ff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,7 +38,8 @@ jobs: - "$HOME/.local/share/renv" - "$TRAVIS_BUILD_DIR/renv/library" script: - - bash tests/scripts/run_tests.sh all test + - bash tests/scripts/run_tests.sh all test + # - bash tests/scripts/run_tests.sh periodic test && tests/scripts/run_tests.sh frequency test - name: Python 3.7 on macOS os: osx osx_image: xcode11.3 @@ -69,7 +70,8 @@ jobs: - "$RENV_PATHS_ROOT" - "$TRAVIS_BUILD_DIR/renv/library" script: - - bash tests/scripts/run_tests.sh periodic test && tests/scripts/run_tests.sh frequency test + - bash tests/scripts/run_tests.sh all test + # - bash tests/scripts/run_tests.sh periodic test # && tests/scripts/run_tests.sh frequency test - stage: deploy name: Python 3.7 on Xenial Linux Docker os: linux diff --git a/tests/scripts/run_tests.sh b/tests/scripts/run_tests.sh index 81e93c37..c1dc66ae 100755 --- a/tests/scripts/run_tests.sh +++ b/tests/scripts/run_tests.sh @@ -74,8 +74,7 @@ then display_usage elif [ $1 == 'all' ] then - run_periodic_pipeline || travis_terminate 1; - run_frequency_pipeline + run_periodic_pipeline && run_frequency_pipeline elif [ $1 == 'periodic' ] then run_periodic_pipeline @@ -92,8 +91,7 @@ then clean_old_data if [ $2 == 'all' ] then - run_periodic_pipeline - run_frequency_pipeline + run_periodic_pipeline && run_frequency_pipeline if [ $# -gt 2 ] && [ $3 == 'test' ] then run_periodic_test @@ -123,8 +121,7 @@ then run_frequency_pipeline if [ $2 == 'test' ] then - run_periodic_test || travis_terminate 1; - run_frequency_test + run_periodic_test && run_frequency_test else display_usage fi