diff --git a/dockerfiles/ecofiles/test-mysqljs.sh b/dockerfiles/ecofiles/test-mysqljs.sh index 79363989..c33ac934 100644 --- a/dockerfiles/ecofiles/test-mysqljs.sh +++ b/dockerfiles/ecofiles/test-mysqljs.sh @@ -5,6 +5,7 @@ set -xeuvo pipefail cd /code [ -d mysql ] || git clone https://github.com/mysqljs/mysql cd mysql +chmod -R go-w . git clean -dfx git pull --tags if [ $# -gt 0 ] @@ -15,7 +16,7 @@ then fi cd ../"$1" # this is right for tags, not for branches yet - git checkout $1 + git checkout "$1" fi git checkout -- . @@ -52,18 +53,11 @@ case "${VERSION}" in # From https://github.com/mysqljs/mysql/pull/2442/files#diff-5979044946698d18a2cdc979898085cdddf5f9911974e8e7a4476efd25c07d82R35 # ER_LOAD_INFILE_CAPABILITY_DISABLED sed -i -e "s/err.code, 'ER_NOT_ALLOWED_COMMAND'/err.errno, 4166/" test/integration/connection/test-load-data-infile-disable.js - ;& -10\.3\.*) sed -i -e 's/PROTOCOL_CONNECTION_LOST/ECONNRESET/g' test/integration/connection/test-server-timeout-disconnect.js - ;& -10\.[012]\.*) - ;& -5\.*) - # no changes esac cd ./test # Run integration test - we are more interested in this! /usr/local/mariadb/bin/mysql -u root -e "CREATE DATABASE IF NOT EXISTS node_mysql_test" -MYSQL_HOST=localhost MYSQL_PORT=3306 MYSQL_DATABASE=node_mysql_test MYSQL_USER=root MYSQL_PASSWORD= FILTER=integration npm test +MYSQL_HOST=localhost MYSQL_PORT=3306 MYSQL_DATABASE=node_mysql_test MYSQL_USER=root MYSQL_PASSWORD='' FILTER=integration npm test diff --git a/scripts/deb-install.sh b/scripts/deb-install.sh index a61e5b36..2ef59d5e 100755 --- a/scripts/deb-install.sh +++ b/scripts/deb-install.sh @@ -32,8 +32,9 @@ for cmd in wget gunzip; do command -v $cmd >/dev/null || { bb_log_err "$cmd command not found" && exit 1; } done -# setup repository -deb_setup_mariadb_mirror "$master_branch" +# setup repository //TEMP this should not be needed since installation is +# supposed to be done directly from artifacts, but maybe it is for dependencies? +# deb_setup_mariadb_mirror "$master_branch" # setup repository for BB artifacts deb_setup_bb_artifacts_mirror