[airflow] branch v1-10-test updated: CI: Propogate Exit Code Correctly (#9247)

[ka...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kaxilnaik pushed a commit to branch v1-10-test
in repository https://gitbox.apache.org/repos/asf/airflow.git


The following commit(s) were added to refs/heads/v1-10-test by this push:
     new 77016b0  CI: Propogate Exit Code Correctly (#9247)
77016b0 is described below

commit 77016b075033d1768255806e48d9e2a3b97db3f0
Author: Kaxil Naik <ka...@gmail.com>
AuthorDate: Fri Jun 12 15:55:58 2020 +0100

    CI: Propogate Exit Code Correctly (#9247)
    
    This was unfortunately broken since #9138
    
    Co-authored-by: Ash Berlin-Taylor <as...@firemirror.com>
    (cherry picked from commit 2540d9cd0a446ff74b4e4d50c20d8a82303329fc)
---
 scripts/ci/ci_run_airflow_testing.sh | 35 +----------------------------------
 1 file changed, 1 insertion(+), 34 deletions(-)

diff --git a/scripts/ci/ci_run_airflow_testing.sh b/scripts/ci/ci_run_airflow_testing.sh
index 5c707c5..ad24a77 100755
--- a/scripts/ci/ci_run_airflow_testing.sh
+++ b/scripts/ci/ci_run_airflow_testing.sh
@@ -108,37 +108,4 @@ done
 
 RUN_INTEGRATION_TESTS=${RUN_INTEGRATION_TESTS:=""}
 
-# Repeat tests in case initialization failed
-set +u
-MAX_RETRIES=4
-while [[ ${MAX_RETRIES} -ge "0" ]]
-do
-    set +e
-    run_airflow_testing_in_docker "${@}"
-    EXIT_CODE=$?
-    set -e
-    if [[ ${EXIT_CODE} == 254 ]] ; then
-        echo
-        echo "Retrying on initialization failure. Remaining ${MAX_RETRIES} retries left"
-        echo
-        MAX_RETRIES=$(( MAX_RETRIES - 1 ))
-        # Cleanup docker containers and images to make sure everything is retried from scratch
-        docker-compose -f "${MY_DIR}/docker-compose/base.yml" down --remove-orphans --timeout 20
-        docker system prune --force --volumes
-        continue
-    fi
-    exit ${EXIT_CODE}
-done
-
-# shellcheck disable=SC2016
-docker-compose --log-level INFO \
-  -f "${MY_DIR}/docker-compose/base.yml" \
-  -f "${MY_DIR}/docker-compose/backend-${BACKEND}.yml" \
-  "${INTEGRATIONS[@]}" \
-  "${DOCKER_COMPOSE_LOCAL[@]}" \
-     run airflow \
-       '/opt/airflow/scripts/ci/in_container/entrypoint_ci.sh "${@}"' \
-       /opt/airflow/scripts/ci/in_container/entrypoint_ci.sh "${@}"
-     # Note the command is there twice (!) because it is passed via bash -c
-     # and bash -c starts passing parameters from $0. TODO: fixme
-set -u
+run_airflow_testing_in_docker "${@}"