Skip to content

Fix too long names of files and docker compose projects #25301

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
potiuk merged 1 commit into from
Jul 26, 2022
Merged

Fix too long names of files and docker compose projects #25301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Dockerfile.ci
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -740,7 +740,7 @@ if [[ "${RUN_TESTS}" != "true" ]]; then
fi
set -u

export RESULT_LOG_FILE="/files/test_result-${TEST_TYPE}-${BACKEND}.xml"
export RESULT_LOG_FILE="/files/test_result-${TEST_TYPE/\[*\]/}-${BACKEND}.xml"

EXTRA_PYTEST_ARGS=(
"--verbosity=0"
Expand Down Expand Up @@ -782,7 +782,7 @@ if [[ ${ENABLE_TEST_COVERAGE:="false"} == "true" ]]; then
EXTRA_PYTEST_ARGS+=(
"--cov=airflow/"
"--cov-config=.coveragerc"
"--cov-report=xml:/files/coverage-${TEST_TYPE}-${BACKEND}.xml"
"--cov-report=xml:/files/coverage-${TEST_TYPE/\[*\]/}-${BACKEND}.xml"
)
fi

Expand Down
6 changes: 3 additions & 3 deletions scripts/ci/testing/ci_run_airflow_testing.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ function run_test_types_in_parallel() {
for TEST_TYPE in ${test_types_to_run}
do
export TEST_TYPE
mkdir -p "${PARALLEL_MONITORED_DIR}/${SEMAPHORE_NAME}/${TEST_TYPE}"
export JOB_LOG="${PARALLEL_MONITORED_DIR}/${SEMAPHORE_NAME}/${TEST_TYPE}/stdout"
export PARALLEL_JOB_STATUS="${PARALLEL_MONITORED_DIR}/${SEMAPHORE_NAME}/${TEST_TYPE}/status"
mkdir -p "${PARALLEL_MONITORED_DIR}/${SEMAPHORE_NAME}/${TEST_TYPE/\[*\]/}"
export JOB_LOG="${PARALLEL_MONITORED_DIR}/${SEMAPHORE_NAME}/${TEST_TYPE/\[*\]/}/stdout"
export PARALLEL_JOB_STATUS="${PARALLEL_MONITORED_DIR}/${SEMAPHORE_NAME}/${TEST_TYPE/\[*\]/}/status"
# Each test job will get SIGTERM followed by SIGTERM 200ms later and SIGKILL 200ms later after 45 mins
# shellcheck disable=SC2086
parallel --ungroup --bg --semaphore --semaphorename "${SEMAPHORE_NAME}" \
Expand Down
6 changes: 3 additions & 3 deletions scripts/ci/testing/ci_run_single_airflow_test_in_docker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,15 +89,15 @@ function run_airflow_testing_in_docker() {
echo
docker-compose -f "${SCRIPTS_CI_DIR}/docker-compose/base.yml" \
"${INTEGRATIONS[@]}" \
--project-name "airflow-${TEST_TYPE,,}-${BACKEND}" \
--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}" \
--project-name "airflow-${TEST_TYPE/\[*\]/}-${BACKEND}" \
run airflow "${@}"
exit_code=$?
docker ps
Expand All @@ -112,7 +112,7 @@ function run_airflow_testing_in_docker() {

docker-compose --log-level INFO -f "${SCRIPTS_CI_DIR}/docker-compose/base.yml" \
"${INTEGRATIONS[@]}" \
--project-name "airflow-${TEST_TYPE,,}-${BACKEND}" \
--project-name "airflow-${TEST_TYPE/\[*\]/}-${BACKEND}" \
down --remove-orphans \
--volumes --timeout 10
set -u
Expand Down
4 changes: 2 additions & 2 deletions scripts/docker/entrypoint_ci.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ if [[ "${RUN_TESTS}" != "true" ]]; then
fi
set -u

export RESULT_LOG_FILE="/files/test_result-${TEST_TYPE}-${BACKEND}.xml"
export RESULT_LOG_FILE="/files/test_result-${TEST_TYPE/\[*\]/}-${BACKEND}.xml"

EXTRA_PYTEST_ARGS=(
"--verbosity=0"
Expand Down Expand Up @@ -286,7 +286,7 @@ if [[ ${ENABLE_TEST_COVERAGE:="false"} == "true" ]]; then
EXTRA_PYTEST_ARGS+=(
"--cov=airflow/"
"--cov-config=.coveragerc"
"--cov-report=xml:/files/coverage-${TEST_TYPE}-${BACKEND}.xml"
"--cov-report=xml:/files/coverage-${TEST_TYPE/\[*\]/}-${BACKEND}.xml"
)
fi

Expand Down