From 67ccbcd8d08b343b9e3e06926a56fac0d53e6093 Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Mon, 27 Apr 2020 23:11:37 +0100
Subject: [PATCH] FIX #11895 Test E2E
---
.gitlab-ci.yml | 4 ++++
ci/docker_install_database.sh | 2 ++
2 files changed, 6 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ae9c54e2f83..9532a078fb5 100755
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -36,6 +36,10 @@ job_e2e:
image: php:7.4-apache
stage: test
script:
+ - service postgresql restart
+ - sed -i -e "s/error_reporting = E_ALL \& ~E_DEPRECATED \& ~E_STRICT/error_reporting = E_ALL \& ~E_NOTICE \& ~E_DEPRECATED \& ~E_STRICT/g" /etc/php/7.4/apache2/php.ini \
+ - sed -i -e "s/display_errors = Off/display_errors = On/g" /etc/php/7.4/apache2/php.ini \
+ - sed -i -e "s/short_open_tag = Off/short_open_tag = On/g" /etc/php/7.4/apache2/php.ini
- service apache2 start
- mkdir -p /opt/maarch/docservers/indexes/{letterbox_coll,attachments_coll,version_attachments_coll}
- mkdir -p /opt/maarch/docservers/{ai,manual,manual_attachments,templates,acknowledgement_receipts}
diff --git a/ci/docker_install_database.sh b/ci/docker_install_database.sh
index 6bb5e680128..0eacf8d452d 100755
--- a/ci/docker_install_database.sh
+++ b/ci/docker_install_database.sh
@@ -11,3 +11,5 @@ apt-get install postgresql-client -yqq
psql -h "postgres" -U "$POSTGRES_USER" -d "$POSTGRES_DB" -w < /builds/maarch/MaarchCourrier/sql/structure.sql
psql -h "postgres" -U "$POSTGRES_USER" -d "$POSTGRES_DB" -w < /builds/maarch/MaarchCourrier/sql/data_fr.sql
+
+sed -i -e "s/datestyle = 'iso, mdy'/datestyle = 'iso, dmy'/g" /etc/postgresql/10/main/postgresql.conf
--
GitLab