From c3c028f113c410038332e3702d43be4533b61b35 Mon Sep 17 00:00:00 2001
From: Daniel Hornung <d.hornung@indiscale.com>
Date: Mon, 5 Jul 2021 13:39:02 +0200
Subject: [PATCH] WIP: CI for mysql: Default authentication method.
---
.gitlab-ci.yml | 7 ++++---
utils/load_settings.sh | 3 ---
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d2f8378..90d597d 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 b4f41b6..c24a0f4 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
--
GitLab