Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 2 additions & 3 deletions breeze
Original file line number Diff line number Diff line change
Expand Up @@ -647,9 +647,6 @@ export ENABLED_SYSTEMS="${ENABLED_SYSTEMS}"
export GITHUB_ACTIONS="${GITHUB_ACTIONS}"
export ISSUE_ID="${ISSUE_ID}"
export NUM_RUNS="${NUM_RUNS}"
export RUN_TESTS="${RUN_TESTS}"
export RUN_INTEGRATION_TESTS="${RUN_INTEGRATION_TESTS}"
export RUN_SYSTEM_TESTS="${RUN_SYSTEM_TESTS}"
export VERSION_SUFFIX_FOR_SVN="${VERSION_SUFFIX_FOR_SVN}"
export VERSION_SUFFIX_FOR_PYPI="${VERSION_SUFFIX_FOR_PYPI}"
docker-compose ${command}
Expand Down Expand Up @@ -3480,6 +3477,8 @@ function breeze::run_breeze_command() {
docker_engine_resources::check_all_resources
export RUN_TESTS="true"
readonly RUN_TESTS
export ENABLED_INTEGRATIONS="${INTEGRATIONS[*]}"
export LIST_OF_INTEGRATION_TESTS_TO_RUN="${INTEGRATIONS[*]}"
${run_command} "${BUILD_CACHE_DIR}/${DOCKER_COMPOSE_RUN_SCRIPT_FOR_CI}" run --service-ports --rm airflow "$@"
;;
run_docker_compose)
Expand Down
2 changes: 1 addition & 1 deletion scripts/ci/docker-compose/_docker.env
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ PRINT_INFO_FROM_SCRIPTS
PYTHONDONTWRITEBYTECODE
PYTHON_MAJOR_MINOR_VERSION
RUN_TESTS
RUN_INTEGRATION_TESTS
LIST_OF_INTEGRATION_TESTS_TO_RUN
RUN_SYSTEM_TESTS
START_AIRFLOW
TEST_TYPE
Expand Down
2 changes: 1 addition & 1 deletion scripts/ci/docker-compose/base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ services:
- PYTHONDONTWRITEBYTECODE=${PYTHONDONTWRITEBYTECODE}
- PYTHON_MAJOR_MINOR_VERSION=${PYTHON_MAJOR_MINOR_VERSION}
- RUN_TESTS=${RUN_TESTS}
- RUN_INTEGRATION_TESTS=${RUN_INTEGRATION_TESTS}
- LIST_OF_INTEGRATION_TESTS_TO_RUN=${LIST_OF_INTEGRATION_TESTS_TO_RUN}
- RUN_SYSTEM_TESTS=${RUN_SYSTEM_TESTS}
- START_AIRFLOW=${START_AIRFLOW}
- TEST_TYPE=${TEST_TYPE}
Expand Down
6 changes: 3 additions & 3 deletions scripts/ci/libraries/_initialization.sh
Original file line number Diff line number Diff line change
Expand Up @@ -594,10 +594,10 @@ function initialization::initialize_test_variables() {
export RUN_TESTS=${RUN_TESTS:="false"}

# Do not run integration tests by default
export RUN_INTEGRATION_TESTS=${RUN_INTEGRATION_TESTS:="false"}
export LIST_OF_INTEGRATION_TESTS_TO_RUN=${LIST_OF_INTEGRATION_TESTS_TO_RUN:=""}

# Do not run system tests by default
export RUN_SYSTEM_TESTS=${RUN_SYSTEM_TESTS:="false"}
# Do not run system tests by default (they can be enabled by setting the RUN_SYSTEM_TESTS variable to "true")
export RUN_SYSTEM_TESTS=${RUN_SYSTEM_TESTS:=""}

}

Expand Down
4 changes: 2 additions & 2 deletions scripts/ci/testing/ci_run_single_airflow_test_in_docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@ function prepare_tests() {

if [[ ${TEST_TYPE:=} == "Integration" ]]; then
export ENABLED_INTEGRATIONS="${AVAILABLE_INTEGRATIONS}"
export RUN_INTEGRATION_TESTS="${AVAILABLE_INTEGRATIONS}"
export LIST_OF_INTEGRATION_TESTS_TO_RUN="${AVAILABLE_INTEGRATIONS}"
else
export ENABLED_INTEGRATIONS=""
export RUN_INTEGRATION_TESTS=""
export LIST_OF_INTEGRATION_TESTS_TO_RUN=""
fi

for _INT in ${ENABLED_INTEGRATIONS}
Expand Down
4 changes: 2 additions & 2 deletions scripts/in_container/entrypoint_ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -326,9 +326,9 @@ fi
readonly SELECTED_TESTS CLI_TESTS API_TESTS PROVIDERS_TESTS CORE_TESTS WWW_TESTS \
ALL_TESTS ALL_PRESELECTED_TESTS

if [[ -n ${RUN_INTEGRATION_TESTS=} ]]; then
if [[ -n ${LIST_OF_INTEGRATION_TESTS_TO_RUN=} ]]; then
# Integration tests
for INT in ${RUN_INTEGRATION_TESTS}
for INT in ${LIST_OF_INTEGRATION_TESTS_TO_RUN}
do
EXTRA_PYTEST_ARGS+=("--integration" "${INT}")
done
Expand Down