[airflow] 01/01: Actually run against the version of the DB we select in the matrix. (#12591)

[po...@apache.org]

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

potiuk pushed a commit to branch v1-10-test
in repository https://gitbox.apache.org/repos/asf/airflow.git

commit 55cafbb7bc04da2f1458dcb48238df3abc17fe1a
Author: Ash Berlin-Taylor <as...@firemirror.com>
AuthorDate: Wed Nov 25 20:17:10 2020 +0000

    Actually run against the version of the DB we select in the matrix. (#12591)
    
    Due to a bug in Breeze initialization code, we were always running
    against Postgres 9.6 and MySQL 5.7, even when the matrix selected
    something else.
    
    (We were overwriting the POSTGRES_VERSION and MYSQL_VERSION environment
    variables in initialization code)
    
    (cherry picked from commit 54adda50c69b17ffc997348b8151c6196ecf5045)
---
 scripts/ci/libraries/_initialization.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/ci/libraries/_initialization.sh b/scripts/ci/libraries/_initialization.sh
index 396bded..5890834 100644
--- a/scripts/ci/libraries/_initialization.sh
+++ b/scripts/ci/libraries/_initialization.sh
@@ -102,10 +102,10 @@ function initialization::initialize_base_variables() {
     export CURRENT_MYSQL_VERSIONS
 
     # Default Postgres versions
-    export POSTGRES_VERSION=${CURRENT_POSTGRES_VERSIONS[0]}
+    export POSTGRES_VERSION=${POSTGRES_VERSION:=${CURRENT_POSTGRES_VERSIONS[0]}}
 
     # Default MySQL versions
-    export MYSQL_VERSION=${CURRENT_MYSQL_VERSIONS[0]}
+    export MYSQL_VERSION=${MYSQL_VERSION:=${CURRENT_MYSQL_VERSIONS[0]}}
 
     # If set to true, the database will be reset at entry. Works for Postgres and MySQL
     export DB_RESET=${DB_RESET:="false"}