Update testing setup to use only 5 concurrent CI VMs

Author: brycekahle

.travis.yml

@@ -12,29 +12,30 @@ env:
 matrix:
   include:
   - env: NODE_ENV=development
-  - env: BROWSER_NAME=chrome BROWSER_VERSION=latest
-  - env: BROWSER_NAME=firefox BROWSER_VERSION=latest
-  - env: BROWSER_NAME=microsoftedge BROWSER_VERSION=latest
+  - env: BROWSER=true
+  #- env: BROWSER_NAME=chrome BROWSER_VERSION=latest
+  #- env: BROWSER_NAME=firefox BROWSER_VERSION=latest
+  #- env: BROWSER_NAME=microsoftedge BROWSER_VERSION=latest
   #   env: BROWSER_NAME=safari BROWSER_VERSION=5
-  - env: BROWSER_NAME=safari BROWSER_VERSION=6
-  - env: BROWSER_NAME=safari BROWSER_VERSION=7
-  - env: BROWSER_NAME=safari BROWSER_VERSION=8
-  - env: BROWSER_NAME=safari BROWSER_VERSION=9
-  - env: BROWSER_NAME=safari BROWSER_VERSION=10
+  #- env: BROWSER_NAME=safari BROWSER_VERSION=6
+  #- env: BROWSER_NAME=safari BROWSER_VERSION=7
+  #- env: BROWSER_NAME=safari BROWSER_VERSION=8
+  #- env: BROWSER_NAME=safari BROWSER_VERSION=9
+  #- env: BROWSER_NAME=safari BROWSER_VERSION=10
   # Global usage is < 0.10% for IE6 & 7
-  - env: BROWSER_NAME=ie BROWSER_VERSION=6
-  - env: BROWSER_NAME=ie BROWSER_VERSION=7
-  - env: BROWSER_NAME=ie BROWSER_VERSION=8
-  - env: BROWSER_NAME=ie BROWSER_VERSION=9
-  - env: BROWSER_NAME=ie BROWSER_VERSION=10 BROWSER_PLATFORM="Windows 2012"
-  - env: BROWSER_NAME=ie BROWSER_VERSION=11 BROWSER_PLATFORM="Windows 2012"
+  #- env: BROWSER_NAME=ie BROWSER_VERSION=6
+  #- env: BROWSER_NAME=ie BROWSER_VERSION=7
+  #- env: BROWSER_NAME=ie BROWSER_VERSION=8
+  #- env: BROWSER_NAME=ie BROWSER_VERSION=9
+  #- env: BROWSER_NAME=ie BROWSER_VERSION=10 BROWSER_PLATFORM="Windows 2012"
+  #- env: BROWSER_NAME=ie BROWSER_VERSION=11 BROWSER_PLATFORM="Windows 2012"
   # Global Usage < 0.10% on less than 12
   #   env: BROWSER_NAME=opera BROWSER_VERSION=11
   # Sauce Labs doesn't have anything newer than 12 :(
-  - env: BROWSER_NAME=opera BROWSER_VERSION=12
-  - env: BROWSER_NAME=iphone BROWSER_VERSION=8.4
-  - env: BROWSER_NAME=iphone BROWSER_VERSION=9.3
-  - env: BROWSER_NAME=iphone BROWSER_VERSION=10
+  #- env: BROWSER_NAME=opera BROWSER_VERSION=12
+  #- env: BROWSER_NAME=iphone BROWSER_VERSION=8.4
+  #- env: BROWSER_NAME=iphone BROWSER_VERSION=9.3
+  #- env: BROWSER_NAME=iphone BROWSER_VERSION=10
   # Android VMs on Sauce Labs don't seem to work correctly
   #   env: BROWSER_NAME=android BROWSER_VERSION=4.1
   #   env: BROWSER_NAME=android BROWSER_VERSION=4.2

.zuul.yml

@@ -4,6 +4,7 @@ scripts:
   - "/domain.js"
 server: ./tests/support/sockjs_server.js
 coverage: false
+concurrency: 5
 tunnel:
   type: ngrok
   proto: tcp
@@ -19,12 +20,12 @@ browsers:
   - name: microsoftedge
     version: latest
   - name: opera
-    version: 11..latest
+    version: latest
   - name: safari
-    version: 5..latest
+    version: latest
   - name: ie
-    version: 6..latest
-  - name: iphone
-    version: 8.1..latest
+    version: latest
+  # - name: iphone
+  #   version: latest
   - name: android
-    version: 4.1..latest
+    version: latest

build.sh

@@ -1,12 +1,14 @@
 #!/bin/bash
 set -e
 
-if [ "x${BROWSER_NAME}" = "x" ]; then
+if [ "x${BROWSER}" = "x" ]; then
 	npm run lint
 	npm test
 elif [ "${TRAVIS_SECURE_ENV_VARS}" = "true" ]; then
 	npm run test:bundle
-	if [ "x${BROWSER_PLATFORM}" = "x" ]; then
+	if [ "x${BROWSER_NAME}" = "x" ]; then
+		./node_modules/.bin/zuul tests/browser.js
+	elif [ "x${BROWSER_PLATFORM}" = "x" ]; then
 		./node_modules/.bin/zuul --browser-name $BROWSER_NAME --browser-version $BROWSER_VERSION tests/browser.js
 	else
 		./node_modules/.bin/zuul --browser-name $BROWSER_NAME --browser-version $BROWSER_VERSION --browser-platform "$BROWSER_PLATFORM" tests/browser.js