From a86379d3e16ff4cf4db9825aee550a516f7e6da0 Mon Sep 17 00:00:00 2001 From: Ash Berlin-Taylor Date: Tue, 24 Nov 2020 16:19:43 +0000 Subject: [PATCH] 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) --- 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 f47a818832728..aaf2d01855d74 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"}