diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d2f8378e31cecc95257429bac1f900c5e5f25453..90d597d2027853e70449ced3097c9ee439152242 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,8 +20,10 @@ # services: - # - mariadb:10.4 - - mysql:8.0 + - mariadb:10.4 + - name: mysql:8.0 + command: --default-authentication-plugin=mysql_native_password + variables: DEPLOY_REF: dev CI_REGISTRY_IMAGE: $CI_REGISTRY/caosdb/src/caosdb-mysqlbackend/testenv:latest @@ -67,7 +69,6 @@ unittests: - echo "MYSQL_USER_PASSWORD=$MYSQL_ROOT_PASSWORD" >> .config - echo "MYSQL_HOST=mysql" >> .config - sleep 10 - - cat .config - make install - ./utils/make_db restore_db tests/example.dump.sql - ./tests/test_utils.sh diff --git a/utils/load_settings.sh b/utils/load_settings.sh index b4f41b637afc54ac7c267824f3457b7b58b0f103..c24a0f4baf6e9e15e56e7ffeacb265b0b5f01673 100644 --- a/utils/load_settings.sh +++ b/utils/load_settings.sh @@ -56,9 +56,6 @@ if [[ -z "$MYSQL_CMD" ]] ; then fi # Restore backup. -echo "-------" -echo "$my_env" -echo "-------" eval "$my_env" export MYSQL_CMD