From b760923fa1b565e9a9a46a2a13ce41a8ef4861be Mon Sep 17 00:00:00 2001
From: Jens Ulferts <j.ulferts@finn.de>
Date: Tue, 2 Oct 2018 16:08:28 +0200
Subject: [PATCH] Updating generated .travis.yml from devkit

[ci skip]
---
 .travis.yml | 66 +++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 49 insertions(+), 17 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5237b09744..f877d60b96 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -47,7 +47,10 @@ dist: trusty
 cache:
   bundler: true
   directories:
-    - frontend/node_modules
+    - frontend/node_modules/foundation-apps
+    - public/assets
+    - app/assets/javascripts/bundles
+    - app/assets/javascripts/locales
 
 branches:
   only:
@@ -60,11 +63,6 @@ env:
     - CI=true
     - RAILS_ENV=test
 
-  matrix:
-    - "TEST_SUITE=plugins:specs     DB=mysql    GROUP_SIZE=1 GROUP=1"
-    - "TEST_SUITE=plugins:features  DB=mysql    GROUP_SIZE=1 GROUP=1"
-
-
 
 before_install:
   ## Custom plugin instructions follow.
@@ -80,25 +78,59 @@ before_install:
   - git fetch --depth=1 openproject
   - git checkout openproject/$TRAVIS_BRANCH
 
-  # Install pandoc for testing textile migration
-  - travis_retry sudo apt-get update -qq
-  - travis_retry sudo apt-get install -qq pandoc
-
-  # Install Node latest LTS
-  - "nvm install --lts"
   # work around https://github.com/travis-ci/travis-ci/issues/8969
   - travis_retry gem update --system
   # Don't install 1.16.3
   - gem install bundler -v 1.16.2
 
+  # Install Node latest LTS
+  # This should only be necessary when preparing the cache or for npm test runs
+  # but installing later fails for unknown reasons.
+  - nvm install --lts
 
 bundler_args: --binstubs --without development production docker
 
-before_script:
-  - bash script/ci_setup.sh $TEST_SUITE $DB
-
-script:
-  - bash script/ci_runner.sh
+stages:
+  - prepare cache
+  - test
+
+jobs:
+  include:
+    - stage: prepare cache
+      name: 'Prepare cache'
+      script:
+        - bash script/ci/cache_prepare.sh
+
+    - stage: test
+      name: 'plugins:units (1/1) - mysql'
+      script:
+      - bash script/ci/setup.sh plugins:units mysql
+      - bash script/ci/runner.sh plugins:units 1 1
+    - stage: test
+      name: 'plugins:units (1/1) - postgres'
+      script:
+      - bash script/ci/setup.sh plugins:units postgres
+      - bash script/ci/runner.sh plugins:units 1 1
+    - stage: test
+      name: 'plugins:features (1/1) - mysql'
+      script:
+      - bash script/ci/setup.sh plugins:features mysql
+      - bash script/ci/runner.sh plugins:features 1 1
+    - stage: test
+      name: 'plugins:features (1/1) - postgres'
+      script:
+      - bash script/ci/setup.sh plugins:features postgres
+      - bash script/ci/runner.sh plugins:features 1 1
+    - stage: test
+      name: 'plugins:cucumber (1/1) - mysql'
+      script:
+      - bash script/ci/setup.sh plugins:cucumber mysql
+      - bash script/ci/runner.sh plugins:cucumber 1 1
+    - stage: test
+      name: 'plugins:cucumber (1/1) - postgres'
+      script:
+      - bash script/ci/setup.sh plugins:cucumber postgres
+      - bash script/ci/runner.sh plugins:cucumber 1 1
 
 
 addons: