cut redundant builds from the travis config, fixed jenkins script

.travis.yml

@@ -1,20 +1,23 @@
 language: node_js
-node_js:
-  - "0.10"
-  - "0.8"
-env:
-  # - ES_RELEASE=0.90.0 ES_BRANCH=0.90
-  # - ES_RELEASE=0.90.1 ES_BRANCH=0.90
-  # - ES_RELEASE=0.90.2 ES_BRANCH=0.90
-  # - ES_RELEASE=0.90.3 ES_BRANCH=0.90
-  # - ES_RELEASE=0.90.4 ES_BRANCH=0.90
-  # - ES_RELEASE=0.90.5 ES_BRANCH=0.90
-  # - ES_RELEASE=0.90.6 ES_BRANCH=0.90
-  - ES_RELEASE=0.90.7 ES_BRANCH=0.90
-  - ES_RELEASE=0.90.8 ES_BRANCH=0.90
-  - ES_RELEASE=0.90.9 ES_BRANCH=0.90
-  - ES_BRANCH=0.90
-  - ES_BRANCH=master
+node_js: false
+matrix:
+  fast_finish: true
+
+  include:
+    - node_js: "0.10"
+      env: ES_RELEASE=0.90.8 ES_BRANCH=0.90 NO_UNIT=true
+    - node_js: "0.10"
+      env: ES_RELEASE=0.90.9 ES_BRANCH=0.90 NO_UNIT=true
+    - node_js: "0.10"
+      env: ES_BRANCH=0.90 NO_UNIT=true
+    - node_js: "0.10"
+      env: ES_BRANCH=master
+    - node_js: "0.8"
+      env: ES_BRANCH=master
+
+  exclude:
+    - node_js: false
+
 script: ./scripts/travis.sh
 email:
   recipients:

scripts/jenkins.sh

@@ -1,10 +1,15 @@
 #!/usr/bin/env bash
 
-# generate the latest version of the yaml-tests
-./node_modules/.bin/grunt run:generate_yaml_tests --es_branch="=$ES_V"
-
 export VERBOSE="true"
 
+if [ -x $ES_V ]; then
+  echo "missing ES_V environment var"
+  exit 1
+fi
+
+# generate the latest version of the yaml-tests
+node scripts/generate --es_branch="=$ES_V" --no-api
+
 # unit tests
 ./node_modules/.bin/mocha test/unit/test_*.js \
   --require should \

scripts/travis.sh

@@ -61,14 +61,19 @@ echo -en 'travis_fold:start:setup_es\\r'
   fi
 
   sleep 3
-echo -en 'travis_fold:end:setup_es\\r'
+echo -en 'travis_fold:end:setup_es\\r\\n'
 
 echo -en 'travis_fold:start:install_grunt\\r'
   npm install -g grunt-cli
 echo -en 'travis_fold:end:install_grunt\\r'
 
-grunt --es_branch="=$ES_BRANCH" jshint mochacov:unit run:generate_yaml_tests mochacov:integration mochacov:ship_coverage
-RESULT=$?
+if [ $NO_UNIT = "true" ]; then
+  grunt --es_branch="=$ES_BRANCH" run:generate_yaml_tests mochacov:integration
+  RESULT=$?
+else
+  grunt --es_branch="=$ES_BRANCH" jshint mochacov:unit run:generate_yaml_tests mochacov:integration mochacov:ship_coverage
+  RESULT=$?
+fi
 
 killall java 2>/dev/null
 exit $RESULT