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 2022/06/29 08:48:22 UTC
[airflow] 15/39: Move LOAD_DEFAULT_CONNECTIONS env var to database config section in CI (#24536)
This is an automated email from the ASF dual-hosted git repository.
potiuk pushed a commit to branch v2-3-test
in repository https://gitbox.apache.org/repos/asf/airflow.git
commit e4c41ade22dac0c87e97e58801c1708efa8078a1
Author: Josh Fell <48...@users.noreply.github.com>
AuthorDate: Sat Jun 18 15:34:24 2022 -0400
Move LOAD_DEFAULT_CONNECTIONS env var to database config section in CI (#24536)
(cherry picked from commit fe105f8887d516c4dc6ecff55dded2215280716c)
---
Dockerfile.ci | 2 +-
scripts/docker/entrypoint_ci.sh | 2 +-
scripts/in_container/airflow_ci.cfg | 4 +++-
scripts/in_container/check_environment.sh | 2 +-
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/Dockerfile.ci b/Dockerfile.ci
index 41aaf579ec..537f84a71f 100644
--- a/Dockerfile.ci
+++ b/Dockerfile.ci
@@ -803,7 +803,7 @@ if [[ ${SKIP_ENVIRONMENT_INITIALIZATION=} != "true" ]]; then
cd "${AIRFLOW_SOURCES}"
if [[ ${START_AIRFLOW:="false"} == "true" || ${START_AIRFLOW} == "True" ]]; then
- export AIRFLOW__CORE__LOAD_DEFAULT_CONNECTIONS=${LOAD_DEFAULT_CONNECTIONS}
+ export AIRFLOW__DATABASE__LOAD_DEFAULT_CONNECTIONS=${LOAD_DEFAULT_CONNECTIONS}
export AIRFLOW__CORE__LOAD_EXAMPLES=${LOAD_EXAMPLES}
# shellcheck source=scripts/in_container/bin/run_tmux
exec run_tmux
diff --git a/scripts/docker/entrypoint_ci.sh b/scripts/docker/entrypoint_ci.sh
index 0aa7e5ddc6..f5198a556c 100755
--- a/scripts/docker/entrypoint_ci.sh
+++ b/scripts/docker/entrypoint_ci.sh
@@ -211,7 +211,7 @@ if [[ ${SKIP_ENVIRONMENT_INITIALIZATION=} != "true" ]]; then
cd "${AIRFLOW_SOURCES}"
if [[ ${START_AIRFLOW:="false"} == "true" || ${START_AIRFLOW} == "True" ]]; then
- export AIRFLOW__CORE__LOAD_DEFAULT_CONNECTIONS=${LOAD_DEFAULT_CONNECTIONS}
+ export AIRFLOW__DATABASE__LOAD_DEFAULT_CONNECTIONS=${LOAD_DEFAULT_CONNECTIONS}
export AIRFLOW__CORE__LOAD_EXAMPLES=${LOAD_EXAMPLES}
# shellcheck source=scripts/in_container/bin/run_tmux
exec run_tmux
diff --git a/scripts/in_container/airflow_ci.cfg b/scripts/in_container/airflow_ci.cfg
index 60b6066144..57863bd9c6 100644
--- a/scripts/in_container/airflow_ci.cfg
+++ b/scripts/in_container/airflow_ci.cfg
@@ -23,12 +23,14 @@ sql_alchemy_conn = # overridden by the startup scripts
#sql_engine_collation_for_ids = overridden by the startup scripts
unit_test_mode = True
load_examples = True
-load_default_connections = True
donot_pickle = False
dags_are_paused_at_creation = False
default_impersonation =
fernet_key = af7CN0q6ag5U3g08IsPsw3K45U7Xa0axgVFhoh-3zB8=
+[database]
+load_default_connections = True
+
[hive]
default_hive_mapred_queue = airflow
diff --git a/scripts/in_container/check_environment.sh b/scripts/in_container/check_environment.sh
index 2ed2a42610..3d9247e095 100755
--- a/scripts/in_container/check_environment.sh
+++ b/scripts/in_container/check_environment.sh
@@ -129,7 +129,7 @@ function startairflow_if_requested() {
echo
echo "Starting Airflow"
echo
- export AIRFLOW__CORE__LOAD_DEFAULT_CONNECTIONS=${LOAD_DEFAULT_CONNECTIONS}
+ export AIRFLOW__DATABASE__LOAD_DEFAULT_CONNECTIONS=${LOAD_DEFAULT_CONNECTIONS}
export AIRFLOW__CORE__LOAD_EXAMPLES=${LOAD_EXAMPLES}
. "$( dirname "${BASH_SOURCE[0]}" )/configure_environment.sh"