Change name of the common environment initialization function (#7805)

apache · Mar 28, 2020 · 4f3b81b · 4f3b81b
1 parent 0720819
commit 4f3b81b
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 16 deletions.
diff --git a/breeze b/breeze
@@ -1567,7 +1567,7 @@ function run_breeze_command {
 
 setup_default_breeze_variables
 
-initialize_breeze_environment
+initialize_common_environment
 
 set_mysql_encoding
 

diff --git a/scripts/ci/_script_init.sh b/scripts/ci/_script_init.sh
@@ -25,7 +25,7 @@ set -euo pipefail
 MY_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 export MY_DIR
 
-initialize_breeze_environment
+initialize_common_environment
 
 basic_sanity_checks
 

diff --git a/scripts/ci/_utils.sh b/scripts/ci/_utils.sh
@@ -37,7 +37,11 @@ function verbose_docker {
     docker "${@}"
 }
 
-function initialize_breeze_environment {
+# Common environment that is initialized by both Breeze and CI scripts
+function initialize_common_environment {
+    # default python version
+    PYTHON_VERSION=${PYTHON_VERSION:="3.5"}
+
     AIRFLOW_SOURCES=${AIRFLOW_SOURCES:=$(cd "${MY_DIR}/../../" && pwd)}
     export AIRFLOW_SOURCES
 
@@ -65,11 +69,10 @@ function initialize_breeze_environment {
     export WEBSERVER_HOST_PORT=${WEBSERVER_HOST_PORT:="28080"}
     export POSTGRES_HOST_PORT=${POSTGRES_HOST_PORT:="25433"}
     export MYSQL_HOST_PORT=${MYSQL_HOST_PORT:="23306"}
-    export MYSQL_VERSION=${MYSQL_VERSION:="5.6"}
 
     # Default MySQL/Postgres versions
     export POSTGRES_VERSION=${POSTGRES_VERSION:="9.6"}
-    export MYSQL_VERSION=${MYSQL_VERSION:="5.7"}
+    export MYSQL_VERSION=${MYSQL_VERSION:="5.6"}
 
     # Do not push images from here by default (push them directly from the build script on Dockerhub)
     export PUSH_IMAGES=${PUSH_IMAGES:="false"}
@@ -444,7 +447,7 @@ function assert_not_in_container() {
         echo >&2 "You are inside the Airflow docker container!"
         echo >&2 "You should only run this script from the host."
         echo >&2 "Learn more about how we develop and test airflow in:"
-        echo >&2 "https://github.com/apache/airflow/blob/master/CONTRIBUTING.md"
+        echo >&2 "https://github.com/apache/airflow/blob/master/CONTRIBUTING.rst"
         echo >&2
         exit 1
     fi
@@ -941,15 +944,15 @@ function build_image_on_ci() {
     if [[ ${TRAVIS_JOB_NAME:=""} == "Tests"*"Kubernetes"* ]]; then
         match_files_regexp 'airflow/kubernetes/.*\.py' 'tests/runtime/kubernetes/.*\.py' \
             'airflow/www/.*\.py' 'airflow/www/.*\.js' 'airflow/www/.*\.html' \
-            'scripts/ci/.*'
+            'scripts/ci/.*' 'airflow/example_dags/.*'
         if [[ ${FILE_MATCHES} == "true" ]]; then
             rebuild_ci_image_if_needed
         else
             touch "${BUILD_CACHE_DIR}"/.skip_tests
         fi
     elif [[ ${TRAVIS_JOB_NAME:=""} == "Tests"* ]]; then
         match_files_regexp '.*\.py' 'airflow/www/.*\.py' 'airflow/www/.*\.js' \
-            'airflow/www/.*\.html' 'scripts/ci/.*'
+            'airflow/www/.*\.html' 'scripts/ci/.*' 'airflow/example_dags/.*'
         if [[ ${FILE_MATCHES} == "true" ]]; then
             rebuild_ci_image_if_needed
         else

diff --git a/tests/bats/test_breeze_params.bats b/tests/bats/test_breeze_params.bats
@@ -45,7 +45,7 @@ EOF
 @test "Test wrong value for a parameter but proper stored in the .build/PARAM" {
   load bats_utils
 
-  initialize_breeze_environment
+  initialize_common_environment
 
   export _BREEZE_ALLOWED_TEST_PARAMS="a b c"
   export TEST_PARAM=x
@@ -65,7 +65,7 @@ EOF
 @test "Test wrong value for a parameter stored in the .build/PARAM" {
   load bats_utils
 
-  initialize_breeze_environment
+  initialize_common_environment
 
   export _BREEZE_ALLOWED_TEST_PARAMS="a b c"
   export TEST_PARAM=x
@@ -87,7 +87,7 @@ EOF
 @test "Test correct value for a parameter" {
   load bats_utils
 
-  initialize_breeze_environment
+  initialize_common_environment
 
   export _BREEZE_ALLOWED_TEST_PARAMS="a b c"
   export TEST_PARAM=a
@@ -101,7 +101,7 @@ EOF
 @test "Test correct value for a parameter from multi-line values" {
   load bats_utils
 
-  initialize_breeze_environment
+  initialize_common_environment
 
   _BREEZE_ALLOWED_TEST_PARAMS=$(cat <<-EOF
 a
@@ -122,7 +122,7 @@ EOF
 @test "Test read_parameter from missing file" {
   load bats_utils
 
-  initialize_breeze_environment
+  initialize_common_environment
 
   run read_from_file TEST_PARAM
   [ -z "${TEST_FILE}" ]
@@ -134,7 +134,7 @@ EOF
 @test "Test read_parameter from file" {
   load bats_utils
 
-  initialize_breeze_environment
+  initialize_common_environment
 
   echo "a" > "${AIRFLOW_SOURCES}/.build/.TEST_PARAM"
   run read_from_file TEST_PARAM

diff --git a/tests/bats/test_empty_test.bats b/tests/bats/test_empty_test.bats
@@ -20,7 +20,7 @@
 @test "empty test" {
   load bats_utils
 
-  initialize_breeze_environment
+  initialize_common_environment
 
   run pwd
   [ "${status}" == 0 ]

diff --git a/tests/bats/test_local_mounts.bats b/tests/bats/test_local_mounts.bats
@@ -21,7 +21,7 @@
 @test "convert volume list to docker params" {
   load bats_utils
 
-  initialize_breeze_environment
+  initialize_common_environment
 
   run convert_local_mounts_to_docker_params
   diff <(echo "${output}") - << EOF