Skip to content
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.

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

Moves tests that should be always executed to 'always' directory #11948

Merged
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
1 change: 1 addition & 0 deletions CI.rst
Original file line number Diff line number Diff line change
Expand Up @@ -708,6 +708,7 @@ contributors in case of simpler changes.

We have the following test types (separated by packages in which they are):

* Always - those are tests that should be always executed (always folder)
* Core - for the core Airflow functionality (core folder)
* API - Tests for the Airflow API (api and api_connexion folders)
* CLI - Tests for the Airflow CLI (cli folder)
Expand Down
3 changes: 1 addition & 2 deletions airflow/www/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
from sqlalchemy import and_, desc, func, or_, union_all
from sqlalchemy.orm import joinedload
from wtforms import SelectField, validators
from airflow.utils import json as utils_json

import airflow
from airflow import models, plugins_manager, settings
Expand All @@ -67,7 +66,7 @@
from airflow.security import permissions
from airflow.ti_deps.dep_context import DepContext
from airflow.ti_deps.dependencies_deps import RUNNING_DEPS, SCHEDULER_QUEUED_DEPS
from airflow.utils import timezone
from airflow.utils import json as utils_json, timezone
from airflow.utils.dates import infer_time_unit, scale_time_units
from airflow.utils.helpers import alchemy_to_dict
from airflow.utils.log.log_reader import TaskLogReader
Expand Down
4 changes: 2 additions & 2 deletions scripts/ci/selective_ci_checks.sh
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ function set_basic_checks_only() {
initialization::ga_output basic-checks-only "${@}"
}

ALL_TESTS="Core Other API CLI Providers WWW Integration Heisentests"
ALL_TESTS="Always Core Other API CLI Providers WWW Integration Heisentests"
readonly ALL_TESTS

function set_outputs_run_everything_and_exit() {
Expand Down Expand Up @@ -480,7 +480,7 @@ function calculate_test_types_to_run() {
echo
SELECTED_TESTS="${SELECTED_TESTS} WWW"
fi
initialization::ga_output test-types "Integration Heisentests ${SELECTED_TESTS}"
initialization::ga_output test-types "Always Integration Heisentests ${SELECTED_TESTS}"
fi
}

Expand Down
5 changes: 5 additions & 0 deletions scripts/in_container/entrypoint_ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,7 @@ else
CLI_TESTS=("tests/cli")
API_TESTS=("tests/api" "tests/api_connexion")
PROVIDERS_TESTS=("tests/providers")
ALWAYS_TESTS=("tests/always")
CORE_TESTS=(
"tests/core"
"tests/executors"
Expand All @@ -253,6 +254,7 @@ else
"${API_TESTS[@]}"
"${PROVIDERS_TESTS[@]}"
"${CORE_TESTS[@]}"
"${ALWAYS_TESTS[@]}"
"${WWW_TESTS[@]}"
)

Expand All @@ -264,6 +266,8 @@ else
SELECTED_TESTS=("${PROVIDERS_TESTS[@]}")
elif [[ ${TEST_TYPE:=""} == "Core" ]]; then
SELECTED_TESTS=("${CORE_TESTS[@]}")
elif [[ ${TEST_TYPE:=""} == "Always" ]]; then
SELECTED_TESTS=("${ALWAYS_TESTS[@]}")
elif [[ ${TEST_TYPE:=""} == "WWW" ]]; then
SELECTED_TESTS=("${WWW_TESTS[@]}")
elif [[ ${TEST_TYPE:=""} == "Helm" ]]; then
Expand All @@ -272,6 +276,7 @@ else
find_all_other_tests
SELECTED_TESTS=("${ALL_OTHER_TESTS[@]}")
elif [[ ${TEST_TYPE:=""} == "All" || ${TEST_TYPE} == "Quarantined" || \
${TEST_TYPE} == "Always" || \
${TEST_TYPE} == "Postgres" || ${TEST_TYPE} == "MySQL" || \
${TEST_TYPE} == "Heisentests" || ${TEST_TYPE} == "Long" || \
${TEST_TYPE} == "Integration" ]]; then
Expand Down
File renamed without changes.