(airflow) branch main updated: Only set "running db isolation tests" mode in Breeze for tests (#41135)

[potiuk]

This is an automated email from the ASF dual-hosted git repository.

potiuk pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git


The following commit(s) were added to refs/heads/main by this push:
     new 0433d75594 Only set "running db isolation tests" mode in Breeze for 
tests (#41135)
0433d75594 is described below

commit 0433d75594d45e8a180525ef85685ca8fc75ea7d
Author: Jarek Potiuk <ja...@potiuk.com>
AuthorDate: Tue Jul 30 23:34:32 2024 +0200

    Only set "running db isolation tests" mode in Breeze for tests (#41135)
    
    The recent change caused it to be set also for regular "start-airflow"
---
 Dockerfile.ci                   | 6 ++++--
 scripts/docker/entrypoint_ci.sh | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Dockerfile.ci b/Dockerfile.ci
index 9dc8f5e8d3..226694389a 100644
--- a/Dockerfile.ci
+++ b/Dockerfile.ci
@@ -902,6 +902,7 @@ function environment_initialization() {
         export AIRFLOW__SCHEDULER__STANDALONE_DAG_PROCESSOR=True
     fi
 
+    RUN_TESTS=${RUN_TESTS:="false"}
     if [[ ${DATABASE_ISOLATION=} == "true" ]]; then
         echo "${COLOR_BLUE}Force database isolation 
configuration:${COLOR_RESET}"
         export AIRFLOW__CORE__DATABASE_ACCESS_ISOLATION=True
@@ -910,10 +911,11 @@ function environment_initialization() {
         # the internal API server
         export 
AIRFLOW__CORE__INTERNAL_API_SECRET_KEY="Z27xjUwQTz4txlWZyJzLqg=="
         export 
AIRFLOW__CORE__FERNET_KEY="l7KBR9aaH2YumhL1InlNf24gTNna8aW2WiwF2s-n_PE="
-        export RUN_TESTS_WITH_DATABASE_ISOLATION="true"
+        if [[ ${RUN_TESTS} == "true" ]]; then
+            export RUN_TESTS_WITH_DATABASE_ISOLATION="true"
+        fi
     fi
 
-    RUN_TESTS=${RUN_TESTS:="false"}
     CI=${CI:="false"}
 
     # Added to have run-tests on path
diff --git a/scripts/docker/entrypoint_ci.sh b/scripts/docker/entrypoint_ci.sh
index 345089749f..a014cd091f 100755
--- a/scripts/docker/entrypoint_ci.sh
+++ b/scripts/docker/entrypoint_ci.sh
@@ -120,6 +120,7 @@ function environment_initialization() {
         export AIRFLOW__SCHEDULER__STANDALONE_DAG_PROCESSOR=True
     fi
 
+    RUN_TESTS=${RUN_TESTS:="false"}
     if [[ ${DATABASE_ISOLATION=} == "true" ]]; then
         echo "${COLOR_BLUE}Force database isolation 
configuration:${COLOR_RESET}"
         export AIRFLOW__CORE__DATABASE_ACCESS_ISOLATION=True
@@ -128,10 +129,11 @@ function environment_initialization() {
         # the internal API server
         export 
AIRFLOW__CORE__INTERNAL_API_SECRET_KEY="Z27xjUwQTz4txlWZyJzLqg=="
         export 
AIRFLOW__CORE__FERNET_KEY="l7KBR9aaH2YumhL1InlNf24gTNna8aW2WiwF2s-n_PE="
-        export RUN_TESTS_WITH_DATABASE_ISOLATION="true"
+        if [[ ${RUN_TESTS} == "true" ]]; then
+            export RUN_TESTS_WITH_DATABASE_ISOLATION="true"
+        fi
     fi
 
-    RUN_TESTS=${RUN_TESTS:="false"}
     CI=${CI:="false"}
 
     # Added to have run-tests on path