From 368ee3190fac23f8dfaa1c66625e428e5c232d77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20P=C3=A9pin?= <martin.pepin@ens.fr>
Date: Tue, 12 Sep 2017 00:14:52 +0200
Subject: [PATCH] Update CI: use postgres

---
 .gitlab-ci.yml | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f2635b7b..5080ef32 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,24 +1,20 @@
 services:
-    - mysql:latest
+    - postgres:latest
     - redis:latest
 
 variables:
     # GestioCOF settings
-    DJANGO_SETTINGS_MODULE: "cof.settings_dev"
-    DBNAME: "cof_gestion"
-    DBUSER: "cof_gestion"
-    DBPASSWD: "cof_password"
-    DBHOST: "mysql"
+    DJANGO_SETTINGS_MODULE: "cof.settings.prod"
+    DBHOST: "postgres"
     REDIS_HOST: "redis"
 
     # Cached packages
     PYTHONPATH: "$CI_PROJECT_DIR/vendor/python"
 
-    # mysql service configuration
-    MYSQL_DATABASE: "$DBNAME"
-    MYSQL_USER: "$DBUSER"
-    MYSQL_PASSWORD: "$DBPASSWD"
-    MYSQL_ROOT_PASSWORD: "root_password"
+    # postgres service configuration
+    POSTGRES_PASSWORD: "4KZt3nGPLVeWSvtBZPSM3fSzXpzEU4"
+    POSTGRES_USER: "cof_gestion"
+    POSTGRES_DB: "cof_gestion"
 
 
 cache:
@@ -29,13 +25,12 @@ cache:
 
 before_script:
     - mkdir -p vendor/{python,pip,apt}
-    - apt-get update -q && apt-get -o dir::cache::archives="vendor/apt" install -yqq mysql-client
-    - mysql --user=root --password="$MYSQL_ROOT_PASSWORD" --host="$DBHOST"
-        -e "GRANT ALL ON test_$DBNAME.* TO '$DBUSER'@'%'"
+    - apt-get update -q && apt-get -o dir::cache::archives="vendor/apt" install -yqq postgresql-client
+    - sed -E 's/^REDIS_HOST.*/REDIS_HOST = "redis"/' cof/settings/secret_example.py > cof/settings/secret.py
     # Remove the old test database if it has not been done yet
-    - mysql --user=root --password="$MYSQL_ROOT_PASSWORD" --host="$DBHOST"
+    - psql --username=cof_gestion --password="4KZt3nGPLVeWSvtBZPSM3fSzXpzEU4" --host="$DBHOST"
         -e "DROP DATABASE test_$DBNAME" || true
-    - pip install --cache-dir vendor/pip -t vendor/python -r requirements-devel.txt
+    - pip install --cache-dir vendor/pip -t vendor/python -r requirements.txt
 
 test:
     stage: test