From 2abf7845b67908bad488300929f8cb068a6ac973 Mon Sep 17 00:00:00 2001
From: Ndame Kital <ndame.kial@smile.fr>
Date: Mon, 8 Jun 2020 11:50:29 +0200
Subject: [PATCH] =?UTF-8?q?un=20test=20car=20le=20dossier=20report=20est?=
 =?UTF-8?q?=20ajout=C3=A9=20locale=20mais=20pas=20en=20CI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore        |  1 -
 .gitlab-ci.yml    | 31 +++++++------------------------
 composer.json     |  3 ++-
 reports/junit.xml |  0
 4 files changed, 9 insertions(+), 26 deletions(-)
 create mode 100644 reports/junit.xml

diff --git a/.gitignore b/.gitignore
index 8252b3b4..ee46cd19 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,6 @@
 /.idea/
 /.php_cs*cache
 /reports/
-
 composer.lock
 package-lock.json
 yarn.lock
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7055e438..2ed49f40 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,33 +1,16 @@
 include:
   - project: pole-is/tools/ci-config
-    ref: "2.0.0"
-    file: /php-package-ci.yml
+    ref: "2.1.0"
+    file: /php-multiversions-ci.yml
   - project: pole-is/tools/ci-config
-    ref: "2.0.0"
+    ref: "2.1.0"
     file: /satis-ci.yml
 
-stages:
-  - vendor
-  - test
-  - deploy
-
-# Personnalisation des tâches par défaut:
-
 .php:
   variables:
-    DEBIAN_CODENAME: "stretch"
-    PHP_VERSION: "7.1"
+    PHP_IMAGE: gitlab-registry.irstea.fr/pole-is/docker/php/ci/panther
+    PHP_IMAGE_TAG: "20.02"
 
-test:phpunit:
-#  variables:
-#    PHP_IMAGE: gitlab-registry.irstea.fr/pole-is/docker/php/ci/panther
+.php-test:
   script:
-    - composer test:phpunit -- --coverage-text --coverage-html=reports/coverage --log-junit=reports/junit.xml --colors=never
-  artifacts:
-    name: reports
-    expose_as: "phpunit reports"
-    when: always
-    paths:
-      - reports/
-    reports:
-      junit: reports/junit.xml
+    - composer "$CI_JOB_NAME"
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 8cf9c515..540abfc5 100644
--- a/composer.json
+++ b/composer.json
@@ -161,6 +161,7 @@
       "vendor/bin/phpunit --coverage-text --coverage-html=reports/coverage --log-junit=reports/junit.xml"
     ],
     "test:serve": [
+      "@test:install-assets",
       "@php tests/console server:run -v --docroot=tests/Fixtures/public"
     ],
 
@@ -172,4 +173,4 @@
       "set -x; IMG=`docker build --build-arg \"PHP_VERSION=${PHP_VERSION:-7.1}\" --pull -q .` && docker run --rm -v ${PWD}:/var/www/theme-bundle -u `id -u`:`id -g` $IMG composer test"
     ]
   }
-}
+}
\ No newline at end of file
diff --git a/reports/junit.xml b/reports/junit.xml
new file mode 100644
index 00000000..e69de29b
-- 
GitLab