From a7c8bd91dd9a7f8d690a6328937569d24c87e49d Mon Sep 17 00:00:00 2001
From: "mathias.chouet" <mathias.chouet@irstea.fr>
Date: Mon, 2 Sep 2019 12:21:02 +0200
Subject: [PATCH 01/18] Test CI

---
 .gitlab-ci.yml     | 35 +++++++++++++++++++++++++++++++++++
 jalhyd_branch      |  2 +-
 protractor.conf.js |  2 +-
 3 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 000000000..3f373df97
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,35 @@
+stages:
+  - install
+  - test
+  - build
+  - release-android
+  - release-linux
+
+cache:
+  paths:
+    - node_modules/
+
+build:
+  stage: build
+  script:
+    - npm run build
+
+test:
+  stage: test
+  script:
+    - npm run e2e
+
+install:
+  stage: install
+  script:
+    - npm install
+
+release-android:
+  stage: release-android
+  script:
+    - npm run release-android
+
+release-linux:
+  stage: release-linux
+  script:
+    - npm run release-linux
diff --git a/jalhyd_branch b/jalhyd_branch
index c9cd8896a..1f7391f92 100644
--- a/jalhyd_branch
+++ b/jalhyd_branch
@@ -1 +1 @@
-128-reorganisation-du-stockage-des-resultats-dans-le-nub
+master
diff --git a/protractor.conf.js b/protractor.conf.js
index 4c1db58bb..6c546c716 100644
--- a/protractor.conf.js
+++ b/protractor.conf.js
@@ -16,7 +16,7 @@ exports.config = {
   capabilities: {
     browserName: 'chrome',
     chromeOptions: {
-      // args: [ "--headless", "--window-size=1024x768" ],
+      args: [ "--headless", "--window-size=1024x768" ],
       prefs: {
         download: {
             prompt_for_download: false, 
-- 
GitLab


From 5e18a63ce235cceb8694d09e5e3835661d058da3 Mon Sep 17 00:00:00 2001
From: "mathias.chouet" <mathias.chouet@irstea.fr>
Date: Mon, 2 Sep 2019 14:38:17 +0200
Subject: [PATCH 02/18] Update CI

---
 .gitlab-ci.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3f373df97..99b96ed52 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,10 +1,20 @@
 stages:
+  - jalhyd
   - install
   - test
   - build
   - release-android
   - release-linux
 
+jalhyd:
+  stage: jalhyd
+  script:
+    - cd ..
+    - git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.irstea.fr/cassiopee/jalhyd.git
+    - cd jalhyd
+    - npm install
+    - npm run build
+
 cache:
   paths:
     - node_modules/
-- 
GitLab


From 261b889e17e0b43206a26fefc8f795602c947f06 Mon Sep 17 00:00:00 2001
From: "mathias.chouet" <mathias.chouet@irstea.fr>
Date: Mon, 2 Sep 2019 14:46:10 +0200
Subject: [PATCH 03/18] Update e2e script

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 2fd54de46..23a826e81 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
   "scripts": {
     "ng": "cd . && \"node_modules/.bin/ng\"",
     "lint": "npm run ng -- lint",
-    "e2e": "npm run ng -- e2e",
+    "e2e": "npm run preprocess && npm run ng -- e2e",
     "e2equick": "npm run ng -- e2e --dev-server-target=",
     "mkdocs": "node scripts/mkdocs-preprocess.js && node scripts/python3.js -m mkdocs build",
     "preprocess": "node scripts/preprocessors.js && npm run mkdocs",
-- 
GitLab


From 6f61c2fd695a2662c576e2ed0311b075bde39562 Mon Sep 17 00:00:00 2001
From: "mathias.chouet" <mathias.chouet@irstea.fr>
Date: Mon, 2 Sep 2019 14:48:58 +0200
Subject: [PATCH 04/18] Update CI

---
 .gitlab-ci.yml | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 99b96ed52..1da8692db 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,7 +9,9 @@ stages:
 jalhyd:
   stage: jalhyd
   script:
+    # @TODO extract correct jalhyd branch !
     - cd ..
+    - rm -rf jalhyd
     - git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.irstea.fr/cassiopee/jalhyd.git
     - cd jalhyd
     - npm install
@@ -19,6 +21,12 @@ cache:
   paths:
     - node_modules/
 
+install:
+  stage: install
+  script:
+    - rm -rf node_modules
+    - npm install
+
 build:
   stage: build
   script:
@@ -29,11 +37,6 @@ test:
   script:
     - npm run e2e
 
-install:
-  stage: install
-  script:
-    - npm install
-
 release-android:
   stage: release-android
   script:
-- 
GitLab


From ccf4f80b7a743e9234cb61346ec8bf5a067ac664 Mon Sep 17 00:00:00 2001
From: "mathias.chouet" <mathias.chouet@irstea.fr>
Date: Mon, 2 Sep 2019 14:57:47 +0200
Subject: [PATCH 05/18] Update CI (test)

---
 .gitlab-ci.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1da8692db..ccae23029 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,11 +9,17 @@ stages:
 jalhyd:
   stage: jalhyd
   script:
-    # @TODO extract correct jalhyd branch !
+    - echo "Voilà où ce qu'on est"
+    - pwd
+    - echo "Voilà le merdier qu'ya là-dedans"
+    - ls -l
+    - export JALHYD_BRANCH=`cat jalhyd_branch`
+    - echo "La branche JalHyd est $JALHYD_BRANCH :)"
     - cd ..
     - rm -rf jalhyd
     - git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.irstea.fr/cassiopee/jalhyd.git
     - cd jalhyd
+    - git checkout "$JALHYD_BRANCH"
     - npm install
     - npm run build
 
-- 
GitLab


From b62596c7127387fb47fc5b5001c09978e8f2970b Mon Sep 17 00:00:00 2001
From: "mathias.chouet" <mathias.chouet@irstea.fr>
Date: Mon, 2 Sep 2019 15:22:42 +0200
Subject: [PATCH 06/18] Update CI diag

---
 .gitlab-ci.yml | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ccae23029..b52f72c2a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,10 +1,21 @@
 stages:
-  - jalhyd
-  - install
-  - test
-  - build
-  - release-android
-  - release-linux
+  - bricotest
+  #- jalhyd
+  #- install
+  #- test
+  #- build
+  #- release-android
+  #- release-linux
+
+bricotest:
+  stage: bricotest
+  script:
+    - echo "Voilà qui que je chui"
+    - whoami
+    - echo "Voilà où ce qu'on est"
+    - pwd
+    - echo "Voilà le merdier qu'ya là-dedans"
+    - ls -l
 
 jalhyd:
   stage: jalhyd
-- 
GitLab


From 9ffea1179f8e414768fe7046a41eeb13d9a51646 Mon Sep 17 00:00:00 2001
From: "mathias.chouet" <mathias.chouet@irstea.fr>
Date: Mon, 2 Sep 2019 15:24:49 +0200
Subject: [PATCH 07/18] zboub

---
 .gitlab-ci.yml | 80 +++++++++++++++++++++++++-------------------------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b52f72c2a..34c7dd2de 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,49 +17,49 @@ bricotest:
     - echo "Voilà le merdier qu'ya là-dedans"
     - ls -l
 
-jalhyd:
-  stage: jalhyd
-  script:
-    - echo "Voilà où ce qu'on est"
-    - pwd
-    - echo "Voilà le merdier qu'ya là-dedans"
-    - ls -l
-    - export JALHYD_BRANCH=`cat jalhyd_branch`
-    - echo "La branche JalHyd est $JALHYD_BRANCH :)"
-    - cd ..
-    - rm -rf jalhyd
-    - git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.irstea.fr/cassiopee/jalhyd.git
-    - cd jalhyd
-    - git checkout "$JALHYD_BRANCH"
-    - npm install
-    - npm run build
+# jalhyd:
+#   stage: jalhyd
+#   script:
+#     - echo "Voilà où ce qu'on est"
+#     - pwd
+#     - echo "Voilà le merdier qu'ya là-dedans"
+#     - ls -l
+#     - export JALHYD_BRANCH=`cat jalhyd_branch`
+#     - echo "La branche JalHyd est $JALHYD_BRANCH :)"
+#     - cd ..
+#     - rm -rf jalhyd
+#     - git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.irstea.fr/cassiopee/jalhyd.git
+#     - cd jalhyd
+#     - git checkout "$JALHYD_BRANCH"
+#     - npm install
+#     - npm run build
 
-cache:
-  paths:
-    - node_modules/
+# cache:
+#   paths:
+#     - node_modules/
 
-install:
-  stage: install
-  script:
-    - rm -rf node_modules
-    - npm install
+# install:
+#   stage: install
+#   script:
+#     - rm -rf node_modules
+#     - npm install
 
-build:
-  stage: build
-  script:
-    - npm run build
+# build:
+#   stage: build
+#   script:
+#     - npm run build
 
-test:
-  stage: test
-  script:
-    - npm run e2e
+# test:
+#   stage: test
+#   script:
+#     - npm run e2e
 
-release-android:
-  stage: release-android
-  script:
-    - npm run release-android
+# release-android:
+#   stage: release-android
+#   script:
+#     - npm run release-android
 
-release-linux:
-  stage: release-linux
-  script:
-    - npm run release-linux
+# release-linux:
+#   stage: release-linux
+#   script:
+#     - npm run release-linux
-- 
GitLab


From c2aacfd67669e8b387b95390dbc5d139ea87fd71 Mon Sep 17 00:00:00 2001
From: "mathias.chouet" <mathias.chouet@irstea.fr>
Date: Mon, 2 Sep 2019 15:42:47 +0200
Subject: [PATCH 08/18] Update CI (again !)

---
 .gitlab-ci.yml | 103 +++++++++++++++++++++++--------------------------
 1 file changed, 48 insertions(+), 55 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 34c7dd2de..aa5a9dd02 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,65 +1,58 @@
 stages:
-  - bricotest
-  #- jalhyd
-  #- install
-  #- test
-  #- build
-  #- release-android
-  #- release-linux
-
-bricotest:
-  stage: bricotest
+  #- diagnostic
+  - jalhyd
+  - install
+  - test
+  - build
+  - release-android
+  - release-linux
+
+diagnostic:
+  stage: diagnostic
   script:
-    - echo "Voilà qui que je chui"
     - whoami
-    - echo "Voilà où ce qu'on est"
     - pwd
-    - echo "Voilà le merdier qu'ya là-dedans"
     - ls -l
 
-# jalhyd:
-#   stage: jalhyd
-#   script:
-#     - echo "Voilà où ce qu'on est"
-#     - pwd
-#     - echo "Voilà le merdier qu'ya là-dedans"
-#     - ls -l
-#     - export JALHYD_BRANCH=`cat jalhyd_branch`
-#     - echo "La branche JalHyd est $JALHYD_BRANCH :)"
-#     - cd ..
-#     - rm -rf jalhyd
-#     - git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.irstea.fr/cassiopee/jalhyd.git
-#     - cd jalhyd
-#     - git checkout "$JALHYD_BRANCH"
-#     - npm install
-#     - npm run build
-
-# cache:
-#   paths:
-#     - node_modules/
-
-# install:
-#   stage: install
-#   script:
-#     - rm -rf node_modules
-#     - npm install
+jalhyd:
+  stage: jalhyd
+  script:
+    - export JALHYD_BRANCH=`cat jalhyd_branch`
+    - echo "Branche JalHyd : $JALHYD_BRANCH"
+    - cd ..
+    - rm -rf jalhyd
+    - git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.irstea.fr/cassiopee/jalhyd.git
+    - cd jalhyd
+    - git checkout "$JALHYD_BRANCH"
+    - npm install
+    - npm run build
+
+cache:
+  paths:
+    - node_modules/
+
+install:
+  stage: install
+  script:
+    - rm -rf node_modules
+    - npm install
 
-# build:
-#   stage: build
-#   script:
-#     - npm run build
+build:
+  stage: build
+  script:
+    - npm run build
 
-# test:
-#   stage: test
-#   script:
-#     - npm run e2e
+test:
+  stage: test
+  script:
+    - npm run e2e
 
-# release-android:
-#   stage: release-android
-#   script:
-#     - npm run release-android
+release-android:
+  stage: release-android
+  script:
+    - npm run release-android
 
-# release-linux:
-#   stage: release-linux
-#   script:
-#     - npm run release-linux
+release-linux:
+  stage: release-linux
+  script:
+    - npm run release-linux
-- 
GitLab


From 14ce6a50d99b3c827b9e7e7f4f7694f1b922726e Mon Sep 17 00:00:00 2001
From: "mathias.chouet" <mathias.chouet@irstea.fr>
Date: Mon, 2 Sep 2019 15:43:52 +0200
Subject: [PATCH 09/18] Update CI (encore)

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aa5a9dd02..7d66fd27a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,7 +18,7 @@ jalhyd:
   stage: jalhyd
   script:
     - export JALHYD_BRANCH=`cat jalhyd_branch`
-    - echo "Branche JalHyd : $JALHYD_BRANCH"
+    - echo "Branche JalHyd - $JALHYD_BRANCH"
     - cd ..
     - rm -rf jalhyd
     - git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.irstea.fr/cassiopee/jalhyd.git
-- 
GitLab


From 61919a80c807b3b464c0dff748aae907f2aed734 Mon Sep 17 00:00:00 2001
From: "mathias.chouet" <mathias.chouet@irstea.fr>
Date: Mon, 2 Sep 2019 15:44:19 +0200
Subject: [PATCH 10/18] Update CI (graaaa)

---
 .gitlab-ci.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7d66fd27a..4d4d9908e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,12 +7,12 @@ stages:
   - release-android
   - release-linux
 
-diagnostic:
-  stage: diagnostic
-  script:
-    - whoami
-    - pwd
-    - ls -l
+# diagnostic:
+#   stage: diagnostic
+#   script:
+#     - whoami
+#     - pwd
+#     - ls -l
 
 jalhyd:
   stage: jalhyd
-- 
GitLab


From 2557e2a38fa6db0eaffca1da588babd62b127441 Mon Sep 17 00:00:00 2001
From: "mathias.chouet" <mathias.chouet@irstea.fr>
Date: Mon, 2 Sep 2019 16:20:23 +0200
Subject: [PATCH 11/18] Update CI for python test

---
 .gitlab-ci.yml | 105 +++++++++++++++++++++++++------------------------
 1 file changed, 53 insertions(+), 52 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4d4d9908e..eda82803e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,58 +1,59 @@
 stages:
-  #- diagnostic
-  - jalhyd
-  - install
-  - test
-  - build
-  - release-android
-  - release-linux
-
-# diagnostic:
-#   stage: diagnostic
-#   script:
-#     - whoami
-#     - pwd
-#     - ls -l
-
-jalhyd:
-  stage: jalhyd
+  - diagnostic
+  # - jalhyd
+  # - install
+  # - test
+  # - build
+  # - release-android
+  # - release-linux
+
+diagnostic:
+  stage: diagnostic
   script:
-    - export JALHYD_BRANCH=`cat jalhyd_branch`
-    - echo "Branche JalHyd - $JALHYD_BRANCH"
-    - cd ..
-    - rm -rf jalhyd
-    - git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.irstea.fr/cassiopee/jalhyd.git
-    - cd jalhyd
-    - git checkout "$JALHYD_BRANCH"
-    - npm install
-    - npm run build
-
-cache:
-  paths:
-    - node_modules/
-
-install:
-  stage: install
-  script:
-    - rm -rf node_modules
-    - npm install
+    - whoami
+    - pwd
+    - ls -l
+    - python3 -m mkdocs
 
-build:
-  stage: build
-  script:
-    - npm run build
+# jalhyd:
+#   stage: jalhyd
+#   script:
+#     - export JALHYD_BRANCH=`cat jalhyd_branch`
+#     - echo "Branche JalHyd - $JALHYD_BRANCH"
+#     - cd ..
+#     - rm -rf jalhyd
+#     - git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.irstea.fr/cassiopee/jalhyd.git
+#     - cd jalhyd
+#     - git checkout "$JALHYD_BRANCH"
+#     - npm install
+#     - npm run build
+
+# cache:
+#   paths:
+#     - node_modules/
+
+# install:
+#   stage: install
+#   script:
+#     - rm -rf node_modules
+#     - npm install
 
-test:
-  stage: test
-  script:
-    - npm run e2e
+# build:
+#   stage: build
+#   script:
+#     - npm run build
 
-release-android:
-  stage: release-android
-  script:
-    - npm run release-android
+# test:
+#   stage: test
+#   script:
+#     - npm run e2e
 
-release-linux:
-  stage: release-linux
-  script:
-    - npm run release-linux
+# release-android:
+#   stage: release-android
+#   script:
+#     - npm run release-android
+
+# release-linux:
+#   stage: release-linux
+#   script:
+#     - npm run release-linux
-- 
GitLab


From 21884804f614f8904d186c681c34761cf25d45f1 Mon Sep 17 00:00:00 2001
From: "mathias.chouet" <mathias.chouet@irstea.fr>
Date: Mon, 2 Sep 2019 16:24:24 +0200
Subject: [PATCH 12/18] Up

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index eda82803e..209a6c733 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,7 +12,7 @@ diagnostic:
   script:
     - whoami
     - pwd
-    - ls -l
+    - ls -la
     - python3 -m mkdocs
 
 # jalhyd:
-- 
GitLab


From 7a275affb356ed16427d518fcff0c20e695829bc Mon Sep 17 00:00:00 2001
From: "mathias.chouet" <mathias.chouet@irstea.fr>
Date: Mon, 2 Sep 2019 16:25:48 +0200
Subject: [PATCH 13/18] Update CI (fingers crossed)

---
 .gitlab-ci.yml | 106 ++++++++++++++++++++++++-------------------------
 1 file changed, 53 insertions(+), 53 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 209a6c733..55515fe17 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,59 +1,59 @@
 stages:
-  - diagnostic
-  # - jalhyd
-  # - install
-  # - test
-  # - build
-  # - release-android
-  # - release-linux
-
-diagnostic:
-  stage: diagnostic
-  script:
-    - whoami
-    - pwd
-    - ls -la
-    - python3 -m mkdocs
-
-# jalhyd:
-#   stage: jalhyd
+  # - diagnostic
+  - jalhyd
+  - install
+  - test
+  - build
+  - release-android
+  - release-linux
+
+# diagnostic:
+#   stage: diagnostic
 #   script:
-#     - export JALHYD_BRANCH=`cat jalhyd_branch`
-#     - echo "Branche JalHyd - $JALHYD_BRANCH"
-#     - cd ..
-#     - rm -rf jalhyd
-#     - git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.irstea.fr/cassiopee/jalhyd.git
-#     - cd jalhyd
-#     - git checkout "$JALHYD_BRANCH"
-#     - npm install
-#     - npm run build
-
-# cache:
-#   paths:
-#     - node_modules/
-
-# install:
-#   stage: install
-#   script:
-#     - rm -rf node_modules
-#     - npm install
+#     - whoami
+#     - pwd
+#     - ls -la
+#     - python3 -m mkdocs
 
-# build:
-#   stage: build
-#   script:
-#     - npm run build
+jalhyd:
+  stage: jalhyd
+  script:
+    - export JALHYD_BRANCH=`cat jalhyd_branch`
+    - echo "Branche JalHyd - $JALHYD_BRANCH"
+    - cd ..
+    - rm -rf jalhyd
+    - git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.irstea.fr/cassiopee/jalhyd.git
+    - cd jalhyd
+    - git checkout "$JALHYD_BRANCH"
+    - npm install
+    - npm run build
+
+cache:
+  paths:
+    - node_modules/
+
+install:
+  stage: install
+  script:
+    - rm -rf node_modules
+    - npm install
 
-# test:
-#   stage: test
-#   script:
-#     - npm run e2e
+build:
+  stage: build
+  script:
+    - npm run build
 
-# release-android:
-#   stage: release-android
-#   script:
-#     - npm run release-android
+test:
+  stage: test
+  script:
+    - npm run e2e
 
-# release-linux:
-#   stage: release-linux
-#   script:
-#     - npm run release-linux
+release-android:
+  stage: release-android
+  script:
+    - npm run release-android
+
+release-linux:
+  stage: release-linux
+  script:
+    - npm run release-linux
-- 
GitLab


From b1d8f6fa18843f250aa68d29db891fdf8b2a6777 Mon Sep 17 00:00:00 2001
From: "mathias.chouet" <mathias.chouet@irstea.fr>
Date: Tue, 3 Sep 2019 10:16:04 +0200
Subject: [PATCH 14/18] Update CI

---
 .gitlab-ci.yml | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 55515fe17..30d5a5c3b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,4 @@
 stages:
-  # - diagnostic
   - jalhyd
   - install
   - test
@@ -7,14 +6,6 @@ stages:
   - release-android
   - release-linux
 
-# diagnostic:
-#   stage: diagnostic
-#   script:
-#     - whoami
-#     - pwd
-#     - ls -la
-#     - python3 -m mkdocs
-
 jalhyd:
   stage: jalhyd
   script:
@@ -28,6 +19,9 @@ jalhyd:
     - npm install
     - npm run build
 
+variables:
+  LC_ALL: C.UTF-8
+
 cache:
   paths:
     - node_modules/
-- 
GitLab


From 46bf4ada1444a4951e59eefac62d66d94f4b17e0 Mon Sep 17 00:00:00 2001
From: "mathias.chouet" <mathias.chouet@irstea.fr>
Date: Tue, 3 Sep 2019 10:35:13 +0200
Subject: [PATCH 15/18] Update CI (tags / schedules)

---
 .gitlab-ci.yml | 32 +++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 30d5a5c3b..acaf0836c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,8 +6,18 @@ stages:
   - release-android
   - release-linux
 
+variables:
+  LC_ALL: C.UTF-8
+
+cache:
+  paths:
+    - node_modules/
+
 jalhyd:
   stage: jalhyd
+  only:
+    - tags
+    - schedules
   script:
     - export JALHYD_BRANCH=`cat jalhyd_branch`
     - echo "Branche JalHyd - $JALHYD_BRANCH"
@@ -19,35 +29,43 @@ jalhyd:
     - npm install
     - npm run build
 
-variables:
-  LC_ALL: C.UTF-8
-
-cache:
-  paths:
-    - node_modules/
-
 install:
   stage: install
+  only:
+    - tags
+    - schedules
   script:
     - rm -rf node_modules
     - npm install
 
 build:
   stage: build
+  only:
+    - tags
+    - schedules
   script:
     - npm run build
 
 test:
   stage: test
+  only:
+    - tags
+    - schedules
   script:
     - npm run e2e
 
 release-android:
   stage: release-android
+  only:
+    - tags
+    - schedules
   script:
     - npm run release-android
 
 release-linux:
   stage: release-linux
+  only:
+    - tags
+    - schedules
   script:
     - npm run release-linux
-- 
GitLab


From 30ed69d30b95de9ccd8c89d2112cd7290177f909 Mon Sep 17 00:00:00 2001
From: "mathias.chouet" <mathias.chouet@irstea.fr>
Date: Tue, 3 Sep 2019 10:57:23 +0200
Subject: [PATCH 16/18] Update CI (triggers)

---
 .gitlab-ci.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index acaf0836c..bc26e435f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,6 +18,7 @@ jalhyd:
   only:
     - tags
     - schedules
+    - triggers
   script:
     - export JALHYD_BRANCH=`cat jalhyd_branch`
     - echo "Branche JalHyd - $JALHYD_BRANCH"
@@ -34,6 +35,7 @@ install:
   only:
     - tags
     - schedules
+    - triggers
   script:
     - rm -rf node_modules
     - npm install
@@ -43,6 +45,7 @@ build:
   only:
     - tags
     - schedules
+    - triggers
   script:
     - npm run build
 
@@ -51,6 +54,7 @@ test:
   only:
     - tags
     - schedules
+    - triggers
   script:
     - npm run e2e
 
@@ -59,6 +63,7 @@ release-android:
   only:
     - tags
     - schedules
+    - triggers
   script:
     - npm run release-android
 
@@ -67,5 +72,6 @@ release-linux:
   only:
     - tags
     - schedules
+    - triggers
   script:
     - npm run release-linux
-- 
GitLab


From 9552415a4d23b228d8873069f4507aec2d8961ae Mon Sep 17 00:00:00 2001
From: "mathias.chouet" <mathias.chouet@irstea.fr>
Date: Tue, 3 Sep 2019 11:09:39 +0200
Subject: [PATCH 17/18] Update CI (web)

---
 .gitlab-ci.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bc26e435f..3443b78be 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,7 +18,7 @@ jalhyd:
   only:
     - tags
     - schedules
-    - triggers
+    - web
   script:
     - export JALHYD_BRANCH=`cat jalhyd_branch`
     - echo "Branche JalHyd - $JALHYD_BRANCH"
@@ -35,7 +35,7 @@ install:
   only:
     - tags
     - schedules
-    - triggers
+    - web
   script:
     - rm -rf node_modules
     - npm install
@@ -45,7 +45,7 @@ build:
   only:
     - tags
     - schedules
-    - triggers
+    - web
   script:
     - npm run build
 
@@ -54,7 +54,7 @@ test:
   only:
     - tags
     - schedules
-    - triggers
+    - web
   script:
     - npm run e2e
 
@@ -63,7 +63,7 @@ release-android:
   only:
     - tags
     - schedules
-    - triggers
+    - web
   script:
     - npm run release-android
 
@@ -72,6 +72,6 @@ release-linux:
   only:
     - tags
     - schedules
-    - triggers
+    - web
   script:
     - npm run release-linux
-- 
GitLab


From 4ed523f815c06178622f1edf980416bde503a7ad Mon Sep 17 00:00:00 2001
From: "mathias.chouet" <mathias.chouet@irstea.fr>
Date: Tue, 3 Sep 2019 11:17:41 +0200
Subject: [PATCH 18/18] Update CI (remove e2e)

---
 .gitlab-ci.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3443b78be..7fb685d05 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
 stages:
   - jalhyd
   - install
-  - test
+  #- test
   - build
   - release-android
   - release-linux
@@ -49,14 +49,14 @@ build:
   script:
     - npm run build
 
-test:
-  stage: test
-  only:
-    - tags
-    - schedules
-    - web
-  script:
-    - npm run e2e
+# test:
+#   stage: test
+#   only:
+#     - tags
+#     - schedules
+#     - web
+#   script:
+#     - npm run e2e
 
 release-android:
   stage: release-android
-- 
GitLab