Revert "Introducing flags to skip example dags and default connections (#11099)" (#11110)

This reverts commit 0edc3dd579.
This commit is contained in:
Kaxil Naik 2020-09-23 19:47:43 +01:00 коммит произвёл GitHub
Родитель 04b8adf69d
Коммит 7644c37082
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
5 изменённых файлов: 3 добавлений и 62 удалений

Просмотреть файл

@ -1962,16 +1962,6 @@ This is the current syntax for `./breeze <./breeze>`_:
init.sh. It will be executed after the environment is configured and started (in case
--start-airflow is used).
--skip-example-dags
Airflow example dags will not be included.
--skip-default-connections
Airflow Default Connections will not be created.
-T, --skip-tutorial-objects
Default Connections and sample dags will not be created. Use this to have a clean
Airflow without tutorial objects.
****************************************************************************************************
Kind kubernetes and Kubernetes tests configuration(optional)

36
breeze
Просмотреть файл

@ -68,8 +68,6 @@ export EXTRA_STATIC_CHECK_OPTIONS
# FORCE_BUILD_IMAGES
# PRODUCTION_IMAGE
# PYTHON_MAJOR_MINOR_VERSION
# AIRFLOW__CORE__LOAD_EXAMPLES
# AIRFLOW__CORE__LOAD_DEFAULT_CONNECTIONS
#
# Global variables:
#
@ -116,6 +114,9 @@ function breeze::setup_default_breeze_constants() {
# If set to true, the database will be reset at entry. Works for Postgres and MySQL
export DB_RESET="false"
# If set to true, the database will be initialized, a user created and webserver and scheduler started
export START_AIRFLOW="false"
# If it set is set to specified version, then the source version of Airflow
# is removed and the specified version of Airflow is installed from PyPi
export INSTALL_AIRFLOW_VERSION=""
@ -1005,27 +1006,6 @@ function breeze::parse_arguments() {
echo
shift 2
;;
--skip-example-dags)
export AIRFLOW__CORE__LOAD_EXAMPLES="False"
echo "Airflow sample dags will be skipped"
echo
shift
;;
--skip-default-connections)
export AIRFLOW__CORE__LOAD_DEFAULT_CONNECTIONS="False"
echo "Airflow default connections will be skipped"
echo
shift
;;
-T | --skip-tutorial-objects)
export AIRFLOW__CORE__LOAD_EXAMPLES="False"
export AIRFLOW__CORE__LOAD_DEFAULT_CONNECTIONS="False"
echo "Airflow sample dags will be skipped"
echo
echo "Airflow default connections will be skipped"
echo
shift
;;
-S | --version-suffix-for-pypi)
if [[ -n ${VERSION_SUFFIX_FOR_SVN=} ]]; then
echo
@ -1997,16 +1977,6 @@ ${FORMATTED_INTEGRATIONS}
init.sh. It will be executed after the environment is configured and started (in case
--start-airflow is used).
--skip-example-dags
Airflow example dags will not be included.
--skip-default-connections
Airflow Default Connections will not be created.
-T, --skip-tutorial-objects
Default Connections and sample dags will not be created. Use this to have a clean
Airflow without tutorial objects.
"
}

Просмотреть файл

@ -135,7 +135,6 @@ F P I E: C r
L U X
D: R: c g: s:
S: N:
T
"
_breeze_long_options="
@ -143,7 +142,6 @@ help python: backend: integration:
kubernetes-mode: kubernetes-version: helm-version: kind-version:
skip-mounting-local-sources install-airflow-version: install-airflow-reference: db-reset
verbose assume-yes assume-no assume-quit forward-credentials start-airflow init-script:
skip-example-dags skip-default-connections skip-tutorial-objects
force-build-images force-pull-images production-image extras: force-clean-images skip-rebuild-check
build-cache-local build-cache-pulled build-cache-disabled
dockerhub-user: dockerhub-repo: github-registry github-repository: github-image-id:

Просмотреть файл

@ -60,8 +60,6 @@ services:
- HOST_OS
- PYTHONDONTWRITEBYTECODE
- INIT_SCRIPT_FILE
- AIRFLOW__CORE__LOAD_EXAMPLES
- AIRFLOW__CORE__LOAD_DEFAULT_CONNECTIONS
volumes:
# Pass docker to inside of the container so that Kind and Moto tests can use it.
- /var/run/docker.sock:/var/run/docker.sock

Просмотреть файл

@ -415,8 +415,6 @@ function initialization::initialize_common_environment() {
initialization::initialize_kubernetes_variables
initialization::initialize_git_variables
initialization::initialize_github_variables
initialization::intialize_airflow_variables
}
function initialization::set_default_python_version_if_empty() {
@ -514,8 +512,6 @@ Detected CI build environment:
Initialization variables:
INIT_SCRIPT_FILE: ${INIT_SCRIPT_FILE}
AIRFLOW__CORE__LOAD_EXAMPLES: ${AIRFLOW__CORE__LOAD_EXAMPLES}
AIRFLOW__CORE__LOAD_DEFAULT_CONNECTIONS: ${AIRFLOW__CORE__LOAD_DEFAULT_CONNECTIONS}
EOF
@ -671,9 +667,6 @@ function initialization::make_constants_read_only() {
readonly BUILT_CI_IMAGE_FLAG_FILE
readonly INIT_SCRIPT_FILE
readonly AIRFLOW__CORE__LOAD_EXAMPLES
readonly AIRFLOW__CORE__LOAD_DEFAULT_CONNECTIONS
}
@ -696,11 +689,3 @@ function initialization::ga_output() {
echo "::set-output name=${1}::${2}"
echo "${1}=${2}"
}
function initialization::intialize_airflow_variables(){
# If set to true, the database will be initialized, a user created and webserver and scheduler started
export START_AIRFLOW="False"
export AIRFLOW__CORE__LOAD_EXAMPLES="True"
export AIRFLOW__CORE__LOAD_DEFAULT_CONNECTIONS="True"
}