From 380a5f0cb025d7cb5d99ff9b318e1ffd3f665a93 Mon Sep 17 00:00:00 2001
From: Martin Muller <damadden88@googlemail.com>
Date: Tue, 16 Apr 2019 12:08:17 +0100
Subject: [PATCH] Feature/ACA-1633 travis dist cache (#1074)

* ACA-1633 add new test stage e2
* cache dist
---
 .travis.yml | 57 ++++++++++++++++++++++++++++++-----------------------
 1 file changed, 32 insertions(+), 25 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ba313e7ef..d14ee485c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,46 +8,53 @@ language: node_js
 node_js:
   - '10'
 
-env:
-  matrix:
-    - DEPLOYMENT=Nginx SUITES=authentication
-    - DEPLOYMENT=Nginx SUITES=listViews
-    - DEPLOYMENT=Nginx SUITES=application
-    - DEPLOYMENT=Nginx SUITES=navigation
-    - DEPLOYMENT=Nginx SUITES=pagination
-    - DEPLOYMENT=Nginx SUITES=search
-    - DEPLOYMENT=Nginx SUITES=actionsAvailable
-    - DEPLOYMENT=Nginx SUITES=actions
-    - DEPLOYMENT=Nginx SUITES=viewer
-    - DEPLOYMENT=Nginx SUITES=infoDrawer
-    - DEPLOYMENT=Nginx SUITES=extensions
-
-before_script:
-  - sudo /etc/init.d/postgresql stop
+cache:
+  directories:
+    - node_modules
+    - dist
 
 before_install:
+  - sudo /etc/init.d/postgresql stop
   - npm install -g npm@latest
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
   - sleep 3
 
-script: |
-  if [ "$DEPLOYMENT" == "Nginx" ]; then
-    npm run build.e2e && SUITE="--suite $SUITES" npm run e2e:docker
-  else
-    npm run build.tomcat.e2e && SUITE="--suite $SUITES" npm run docker.tomcat.e2e
-  fi
-
 stages:
   - name: Quality and Unit tests
+  - name: e2e
 
 jobs:
   include:
     - stage: Quality and Unit tests
       name: 'Code quality checks'
-      script:
-        - npm run lint
+      script: npm run lint
     - name: 'Unit tests'
       script:
         - npm run test:ci
         - bash <(curl -s https://codecov.io/bash) -X gcov
+    - name: 'Prepare dist cache'
+      script: npm run build.e2e
+    - stage: e2e
+      name: Test Suite authentication
+      script: SUITE="--suite authentication" npm run e2e:docker
+    - name: Test Suite listViews
+      script: SUITE="--suite listViews" npm run e2e:docker
+    - name: Test Suite application
+      script: SUITE="--suite application" npm run e2e:docker
+    - name: Test Suite navigation
+      script: SUITE="--suite navigation" npm run e2e:docker
+    - name: Test Suite pagination
+      script: SUITE="--suite pagination" npm run e2e:docker
+    - name: Test Suite search
+      script: SUITE="--suite search" npm run e2e:docker
+    - name: Test Suite actionsAvailable
+      script: SUITE="--suite actionsAvailable" npm run e2e:docker
+    - name: Test Suite actions
+      script: SUITE="--suite actions" npm run e2e:docker
+    - name: Test Suite viewer
+      script: SUITE="--suite viewer" npm run e2e:docker
+    - name: Test Suite infoDrawer
+      script: SUITE="--suite infoDrawer" npm run e2e:docker
+    - name: Test Suite extensions
+      script: SUITE="--suite extensions" npm run e2e:docker