From c00d338ff07e204de2cb64a1059eeea19a533c47 Mon Sep 17 00:00:00 2001
From: Andrew Cholakian <andrew@andrewvc.com>
Date: Tue, 14 Feb 2017 09:13:37 -0600
Subject: [PATCH] Run integration tests separately

Fixes #6704
---
 .travis.yml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index cda182983..478b35b04 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,9 @@ rvm:
 jdk:
   - oraclejdk8
 env:
+  - INTEGRATION=false
   - INTEGRATION=true
+  - INTEGRATION=false FEATURE_FLAG=persistent_queues
   - INTEGRATION=true FEATURE_FLAG=persistent_queues
 before_install:
   # Force bundler 1.12.5 because version 1.13 has issues, see https://github.com/fastlane/fastlane/issues/6065#issuecomment-246044617
@@ -17,9 +19,13 @@ before_install:
   - gem install bundler -v 1.12.5 --no-rdoc --no-ri --no-document --quiet   
 install:
   - rake test:install-core
-  - ci/travis_integration_install.sh
 before_script:
   - echo "--order rand" > .rspec
 script:
-  - rake test:core
-  - ci/travis_integration_run.sh
+  - |+
+      if [ "$INTEGRATION" == "true" ]; then
+        ci/travis_integration_install.sh
+        ci/travis_integration_run.sh;
+      else
+        rake test:core
+      fi