[airflow] branch v1-10-test updated: Actually run against the version of the DB we select in the matrix.

[potiuk]

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


The following commit(s) were added to refs/heads/v1-10-test by this push:
     new 876790b  Actually run against the version of the DB we select in the 
matrix.
876790b is described below

commit 876790b3163bb3a4d92d0e8221bbad159f0a20aa
Author: Ash Berlin-Taylor <ash_git...@firemirror.com>
AuthorDate: Tue Nov 24 16:19:43 2020 +0000

    Actually run against the version of the DB we select in the matrix.
    
    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 1573f04bdf0b351cdb70e3c4fbf273a2016651d6)
---
 scripts/ci/docker-compose/backend-mysql.yml | 3 ++-
 scripts/ci/libraries/_initialization.sh     | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/scripts/ci/docker-compose/backend-mysql.yml 
b/scripts/ci/docker-compose/backend-mysql.yml
index 28f396a..b1cacae 100644
--- a/scripts/ci/docker-compose/backend-mysql.yml
+++ b/scripts/ci/docker-compose/backend-mysql.yml
@@ -27,7 +27,6 @@ services:
       - mysql
   mysql:
     image: mysql:${MYSQL_VERSION}
-    command: --character-set-server=${MYSQL_ENCODING} 
--collation-server=${MYSQL_ENCODING}_unicode_ci
     environment:
       - MYSQL_ALLOW_EMPTY_PASSWORD=true
       - MYSQL_ROOT_HOST=%
@@ -38,5 +37,7 @@ services:
       - mysql-db-volume:/var/lib/mysql
     ports:
       - "${MYSQL_HOST_PORT}:3306"
+    command: ['mysqld', '--character-set-server=${MYSQL_ENCODING}',
+              '--collation-server=${MYSQL_ENCODING}_unicode_ci']
 volumes:
   mysql-db-volume:
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"}