From 42f88ecf9d57a224e9e9a0ba2a645f39353599ba Mon Sep 17 00:00:00 2001 From: mehrdadn Date: Thu, 16 Apr 2020 15:23:00 -0700 Subject: [PATCH] Hotfix CI Export Tests to Skip (#8058) Co-authored-by: Mehrdad --- .travis.yml | 1 + ci/travis/ci.sh | 26 +++++++++++++++----------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9d04d7d87..d603ae729 100644 --- a/.travis.yml +++ b/.travis.yml @@ -290,6 +290,7 @@ matrix: - bazel test --config=ci //cpp:all --build_tests_only --test_output=streamed script: + - . ./ci/travis/ci.sh preload # raylet integration tests - ./ci/suppress_output bash src/ray/test/run_core_worker_tests.sh - ./ci/suppress_output bash src/ray/test/run_object_manager_tests.sh diff --git a/ci/travis/ci.sh b/ci/travis/ci.sh index e77b62103..ada7c5675 100755 --- a/ci/travis/ci.sh +++ b/ci/travis/ci.sh @@ -47,6 +47,20 @@ reload_env() { export PATH PYTHON3_BIN_PATH } +preload() { + local job_names="${1-}" + + local variable_definitions + variable_definitions=($(python "${ROOT_DIR}"/determine_tests_to_run.py)) + if [ 0 -lt "${#variable_definitions[@]}" ]; then + export "${variable_definitions[@]}" + fi + + if ! (set +x && should_run_job ${job_names//,/ }); then + exit 0 + fi +} + # Initializes the environment for the current job. Performs the following tasks: # - Calls 'exit 0' to quickly exit if provided a list of job names and none of them has been triggered. # - Sets variables to indicate the job names that have been triggered. @@ -57,17 +71,7 @@ reload_env() { # Usage: init [JOB_NAMES] # - JOB_NAMES (optional): Comma-separated list of job names to trigger on. init() { - local job_names="${1-}" - - local variable_definitions - variable_definitions=($(python "${ROOT_DIR}"/determine_tests_to_run.py)) - if [ 0 -lt "${#variable_definitions[@]}" ]; then - declare "${variable_definitions[@]}" - fi - - if ! (set +x && should_run_job ${job_names//,/ }); then - exit 0 - fi + preload if [ "${OSTYPE}" = msys ]; then export USE_CLANG_CL=1