From 7dd8bdc752284eb7590aa43c7c197b577f4c6823 Mon Sep 17 00:00:00 2001
From: David Beniamine <david.beniamine@tetras-libre.fr>
Date: Wed, 15 Dec 2021 00:26:54 +0100
Subject: [PATCH] Fix test environment

---
 .env.test      |  9 +++++++++
 .gitlab-ci.yml | 11 +----------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.env.test b/.env.test
index 0c00c97..7064803 100644
--- a/.env.test
+++ b/.env.test
@@ -4,5 +4,14 @@ APP_SECRET='$ecretf0rt3st'
 SYMFONY_DEPRECATIONS_HELPER=999999
 PANTHER_APP_ENV=panther
 PANTHER_ERROR_SCREENSHOT_DIR=./var/error-screenshots
+BY_PASS_CODE=ed156b9188ecddf0c556d5712f0a84cc
+MAILER_DSN=null://null
+SYMFONY_SECRET=0f817363a768f111a17d2522b8d7e2d72cf738b1
+LEGACY_URL=http://legacy/
+LEGACY_URL_EXTERNAL=http://localhost/legacy/
+APP_DEBUG=1
+ENV=test
+LOG_LEVEL=DEBUG
+PHP_INI_DATE_TIMEZONE="Europe/Paris"
 
 DATABASE_URL="mysql://rekallfrwsmember:sm4SyZVPu6wpjZfg@mysql:3306/rekallfrwsmember?serverVersion=5.6&charset=utf8"
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8186d9b..50b1239 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,18 +7,9 @@ variables:
   MYSQL_DATABASE: rekallfrwsmember
   MYSQL_PASSWORD: sm4SyZVPu6wpjZfg
   MYSQL_ROOT_PASSWORD:  root
-  BY_PASS_CODE: ed156b9188ecddf0c556d5712f0a84cc
-  MAILER_DSN: null://null
-  SYMFONY_SECRET: 0f817363a768f111a17d2522b8d7e2d72cf738b1
-  LEGACY_URL: http://legacy/
-  LEGACY_URL_EXTERNAL: http://localhost/legacy/
   TEST_IMAGE: registry.gitlab.tetras-libre.fr/rekall/memorekall-member-new
   CI_REGISTRY: registry.gitlab.tetras-libre.fr
-  APP_DEBUG: 1
-  ENV: test
-  LOG_LEVEL: DEBUG
   TZ: "Europe/Paris"
-  PHP_INI_DATE_TIMEZONE: "Europe/Paris"
 
 
 composer:
@@ -37,7 +28,7 @@ composer:
     - if: '$CI_COMMIT_MESSAGE =~ /test/'
     - if: '$CI_COMMIT_BRANCH  =~ /test/ || $CI_COMMIT_BRANCH == "production" || $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
   script:
-    - docker run --rm --name rekall --network rekall -e MYSQL_DATABASE=$MYSQL_DATABASE -e MYSQL_USER=$MYSQL_USER -e MYSQL_ROOT_PASSWORD=$MYSQL_ROOT_PASSWORD -e MYSQL_PASSWORD=$MYSQL_PASSWORD -v ${CI_PROJECT_DIR}/docker/mysql/init_db_d:/docker-entrypoint-initdb.d -d --name=mysql mysql:5.6
+    - docker run --rm --name rekall --network rekall -e TZ=$TZ -e MYSQL_DATABASE=$MYSQL_DATABASE -e MYSQL_USER=$MYSQL_USER -e MYSQL_ROOT_PASSWORD=$MYSQL_ROOT_PASSWORD -e MYSQL_PASSWORD=$MYSQL_PASSWORD -v ${CI_PROJECT_DIR}/docker/mysql/init_db_d:/docker-entrypoint-initdb.d -d --name=mysql mysql:5.6
     - docker run --rm --network rekall -v ${CI_PROJECT_DIR}:/sites/memorekall/www/web_dev -v /log:/sites/memorekall/www/web_dev/log --entrypoint /sites/memorekall/www/web_dev/tools/ci-job.sh $TEST_IMAGE
   after_script:
     - docker stop mysql
-- 
GitLab