From 3261eea0d82bd7d07c0671e3c75209cc5ff442e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20H=C3=A4ttasch?=
<benjamin.haettasch@fachschaft.informatik.tu-darmstadt.de>
Date: Tue, 6 Dec 2022 23:18:39 +0100
Subject: [PATCH] Adapt CI settings for fixture loading
---
.gitlab-ci.yml | 6 ++++--
AKPlanning/settings_ci.py | 5 +++--
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 28c0603b..73637ffc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,11 +17,13 @@ cache:
before_script:
- python -V # Print out python version for debugging
- apt-get -qq update
- - apt-get -qq install -y python3-virtualenv python3 python3-dev python3-pip gettext default-libmysqlclient-dev
+ - apt-get -qq install -y python3-virtualenv python3 python3-dev python3-pip gettext default-mysql-client default-libmysqlclient-dev
- export DJANGO_SETTINGS_MODULE=AKPlanning.settings_ci
- ./Utils/setup.sh --prod
+ - mysql --version
test:
script:
- source venv/bin/activate
- - python manage.py test --settings AKPlanning.settings_ci --keepdb
+ - echo "GRANT ALL on *.* to '${MYSQL_USER}';"| mysql -u root --password="${MYSQL_ROOT_PASSWORD}" -h mysql
+ - python manage.py test --settings AKPlanning.settings_ci
diff --git a/AKPlanning/settings_ci.py b/AKPlanning/settings_ci.py
index 99aa3a7a..77f75f4e 100644
--- a/AKPlanning/settings_ci.py
+++ b/AKPlanning/settings_ci.py
@@ -16,10 +16,11 @@ DATABASES = {
'PASSWORD': 'mysql',
'OPTIONS': {
'init_command': "SET sql_mode='STRICT_TRANS_TABLES'",
- 'charset': "utf8mb4",
},
'TEST': {
- 'NAME': 'test',
+ 'NAME': 'tests',
+ 'CHARSET': "utf8mb4",
+ 'COLLATION': 'utf8mb4_unicode_ci',
},
}
}
--
GitLab