diff --git a/release/alerts/long_running_tests.py b/release/alerts/long_running_tests.py index 187283f8d..13529cbe4 100644 --- a/release/alerts/long_running_tests.py +++ b/release/alerts/long_running_tests.py @@ -21,15 +21,15 @@ def handle_result(created_on: datetime.datetime, category: str, "object_spilling_shuffle", ]: # Core tests - target_update_diff = 120 + target_update_diff = 300 elif test_name in ["apex", "impala", "many_ppo", "pbt"]: # Tune/RLLib style tests - target_update_diff = 360 + target_update_diff = 480 elif test_name in ["serve", "serve_failure"]: # Serve tests have workload logs every five minutes. - # Leave up to 60 seconds overhead. - target_update_diff = 360 + # Leave up to 180 seconds overhead. + target_update_diff = 480 else: return None diff --git a/release/run_e2e.sh b/release/run_e2e.sh index e88801121..9f1ae16fc 100755 --- a/release/run_e2e.sh +++ b/release/run_e2e.sh @@ -90,6 +90,7 @@ done RAY_TEST_REPO=${RAY_TEST_REPO-https://github.com/ray-project/ray.git} RAY_TEST_BRANCH=${RAY_TEST_BRANCH-master} +RELEASE_RESULTS_DIR=${RELEASE_RESULTS_DIR-/tmp/artifacts} export RAY_REPO RAY_BRANCH RAY_VERSION RAY_WHEELS RAY_TEST_REPO RAY_TEST_BRANCH RELEASE_RESULTS_DIR @@ -119,6 +120,8 @@ while [ "$RETRY_NUM" -lt "$MAX_RETRIES" ]; do sleep ${SLEEP_TIME} fi + sudo rm -rf "${RELEASE_RESULTS_DIR}"/* || true + python e2e.py "$@" EXIT_CODE=$? REASON=$(reason "${EXIT_CODE}") @@ -140,7 +143,8 @@ while [ "$RETRY_NUM" -lt "$MAX_RETRIES" ]; do done -sudo cp -rf /tmp/artifacts/* /tmp/ray_release_test_artifacts || true +sudo rm -rf /tmp/ray_release_test_artifacts/* || true +sudo cp -rf "${RELEASE_RESULTS_DIR}"/* /tmp/ray_release_test_artifacts/ || true echo "----------------------------------------" echo "e2e test finished with final exit code ${EXIT_CODE} after ${RETRY_NUM}/${MAX_RETRIES} tries"