You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by po...@apache.org on 2021/09/27 09:50:47 UTC
[airflow] branch main updated: Remove workaround for
docker-compose-failures (#18539)
This is an automated email from the ASF dual-hosted git repository.
potiuk pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new fa1a088 Remove workaround for docker-compose-failures (#18539)
fa1a088 is described below
commit fa1a088d2c02ac85a8e01f91ff2ae80ad0def212
Author: Jarek Potiuk <ja...@potiuk.com>
AuthorDate: Mon Sep 27 11:50:30 2021 +0200
Remove workaround for docker-compose-failures (#18539)
Long time ago we had unknown docker-compose failures that returned
254 exit code. This has long been improved by decreasing memory
pressure for CI dockers and healthiness checks and is no
longer needed.
---
.../ci_run_single_airflow_test_in_docker.sh | 54 ++++++++--------------
1 file changed, 18 insertions(+), 36 deletions(-)
diff --git a/scripts/ci/testing/ci_run_single_airflow_test_in_docker.sh b/scripts/ci/testing/ci_run_single_airflow_test_in_docker.sh
index f8f6d98..a88d061 100755
--- a/scripts/ci/testing/ci_run_single_airflow_test_in_docker.sh
+++ b/scripts/ci/testing/ci_run_single_airflow_test_in_docker.sh
@@ -110,42 +110,24 @@ function run_airflow_testing_in_docker() {
backend_docker_compose+=("-f" "${SCRIPTS_CI_DIR}/docker-compose/backend-mssql-docker-volume.yml")
fi
fi
-
- for try_num in {1..5}
- do
- echo
- echo "Starting try number ${try_num}"
- echo
- echo
- echo "Making sure docker-compose is down and remnants removed"
- echo
-
- docker-compose --log-level INFO -f "${SCRIPTS_CI_DIR}/docker-compose/base.yml" \
- --project-name "airflow-${TEST_TYPE}-${BACKEND}" \
- down --remove-orphans \
- --volumes --timeout 10
- docker-compose --log-level INFO \
- -f "${SCRIPTS_CI_DIR}/docker-compose/base.yml" \
- "${backend_docker_compose[@]}" \
- "${INTEGRATIONS[@]}" \
- "${DOCKER_COMPOSE_LOCAL[@]}" \
- --project-name "airflow-${TEST_TYPE}-${BACKEND}" \
- run airflow "${@}"
- exit_code=$?
- docker-compose --log-level INFO -f "${SCRIPTS_CI_DIR}/docker-compose/base.yml" \
- --project-name "airflow-${TEST_TYPE}-${BACKEND}" \
- down --remove-orphans \
- --volumes --timeout 10
- if [[ ${exit_code} == "254" && ${try_num} != "5" ]]; then
- echo
- echo "Failed try num ${try_num}. Sleeping 5 seconds for retry"
- echo
- sleep 5
- continue
- else
- break
- fi
- done
+ echo "Making sure docker-compose is down and remnants removed"
+ echo
+ docker-compose --log-level INFO -f "${SCRIPTS_CI_DIR}/docker-compose/base.yml" \
+ --project-name "airflow-${TEST_TYPE}-${BACKEND}" \
+ down --remove-orphans \
+ --volumes --timeout 10
+ docker-compose --log-level INFO \
+ -f "${SCRIPTS_CI_DIR}/docker-compose/base.yml" \
+ "${backend_docker_compose[@]}" \
+ "${INTEGRATIONS[@]}" \
+ "${DOCKER_COMPOSE_LOCAL[@]}" \
+ --project-name "airflow-${TEST_TYPE}-${BACKEND}" \
+ run airflow "${@}"
+ exit_code=$?
+ docker-compose --log-level INFO -f "${SCRIPTS_CI_DIR}/docker-compose/base.yml" \
+ --project-name "airflow-${TEST_TYPE}-${BACKEND}" \
+ down --remove-orphans \
+ --volumes --timeout 10
set -u
set -e
if [[ ${exit_code} != "0" ]]; then