From e2168e44742b3a5f0846bfddeb6c9708c5d853f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliver=20G=C3=BCnther?= <mail@oliverguenther.de>
Date: Wed, 1 Aug 2018 08:55:22 +0200
Subject: [PATCH] Updating generated .travis.yml from devkit

[ci skip]
---
 .travis.yml | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 98c2879c46..87f0d2152e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -61,19 +61,8 @@ env:
     - 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"
-    - "TEST_SUITE=npm"
-    - "TEST_SUITE=spec_legacy       DB=mysql"
-    - "TEST_SUITE=cucumber          DB=mysql     GROUP_SIZE=1  GROUP=1"
-    - "TEST_SUITE=specs             DB=mysql     GROUP_SIZE=4  GROUP=1"
-    - "TEST_SUITE=specs             DB=mysql     GROUP_SIZE=4  GROUP=2"
-    - "TEST_SUITE=specs             DB=mysql     GROUP_SIZE=4  GROUP=3"
-    - "TEST_SUITE=specs             DB=mysql     GROUP_SIZE=4  GROUP=4"
-    - "TEST_SUITE=features          DB=mysql     GROUP_SIZE=4  GROUP=1"
-    - "TEST_SUITE=features          DB=mysql     GROUP_SIZE=4  GROUP=2"
-    - "TEST_SUITE=features          DB=mysql     GROUP_SIZE=4  GROUP=3"
-    - "TEST_SUITE=features          DB=mysql     GROUP_SIZE=4  GROUP=4"
+    - "TEST_SUITE=plugins:specs     DB=mysql    GROUP_SIZE=1 GROUP=1 DB=none"
+    - "TEST_SUITE=plugins:features  DB=mysql    GROUP_SIZE=1 GROUP=1 DB=none"
 
 
 
@@ -91,6 +80,10 @@ before_install:
   - git fetch --depth=1 openproject
   - git checkout openproject/$TRAVIS_BRANCH
 
+  # Install pandoc for testing textile migration
+  - sudo apt-get update -qq
+  - sudo apt-get install -qq pandoc
+
   # Install Node latest LTS
   - "nvm install --lts"
   # work around https://github.com/travis-ci/travis-ci/issues/8969
@@ -102,10 +95,10 @@ before_install:
 bundler_args: --binstubs --without development production docker
 
 before_script:
-  - sh script/ci_setup.sh $TEST_SUITE $DB
+  - bash script/ci_setup.sh $TEST_SUITE $DB
 
 script:
-  - sh script/ci_runner.sh
+  - bash script/ci_runner.sh
 
 
 addons: