From f9159a69a3e30553d1608f9aab15af84664b467f Mon Sep 17 00:00:00 2001
From: Spencer Alger <email@spalger.com>
Date: Wed, 1 Apr 2015 12:15:29 -0700
Subject: [PATCH] ES_BRANCH can also be a tag, so changed to ES_REF

---
 grunt/config/esvm.js | 23 ++++++++++++++++-------
 scripts/ci.js        | 14 +++++++-------
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/grunt/config/esvm.js b/grunt/config/esvm.js
index 4d91a8624..6b7de0870 100644
--- a/grunt/config/esvm.js
+++ b/grunt/config/esvm.js
@@ -16,8 +16,16 @@ var defaultOpts = {
   }
 };
 
-function setBranchConfig(branch, target) {
-  switch (branch) {
+/**
+ * set config vars based on the ref.
+ *
+ * @param {string} ref    - either a tag or branch name
+ * @param {[type]} target - the grunt target to configure
+ */
+function setConfig(ref, target) {
+  var minorV = String(ref).replace(/^v/, '').replace(/(\d+\.\d+)\..+/, '$1');
+
+  switch (minorV) {
   case '0.90':
   case '1.0':
   case '1.1':
@@ -56,14 +64,14 @@ utils.branches.forEach(function (branch) {
       branch: branch
     }
   };
-  setBranchConfig(branch, exports[branch]);
+  setConfig(branch, exports[branch]);
 });
 
 
 // ci target, based on env variables
 (function () {
   var release = process.env.ES_RELEASE;
-  var branch = process.env.ES_BRANCH;
+  var ref = process.env.ES_REF;
   var port = process.env.ES_PORT;
 
   var options = {
@@ -75,13 +83,14 @@ utils.branches.forEach(function (branch) {
   if (release) {
     options.version = release;
   }
-  else if (branch) {
-    options.branch = branch;
+  else if (ref) {
+    // assume it is a ref to a branch
+    options.branch = ref;
   }
   else {
     return;
   }
 
   exports.ci_env = { options: options };
-  setBranchConfig(branch, exports.ci_env);
+  setConfig(ref, exports.ci_env);
 }());
\ No newline at end of file
diff --git a/scripts/ci.js b/scripts/ci.js
index eb372f1b9..d9fbf0228 100644
--- a/scripts/ci.js
+++ b/scripts/ci.js
@@ -3,7 +3,7 @@
  *
  * ENV VARS:
  *  RUN - a list of task names to run, specifying this turns of all other tasks
- *  ES_BRANCH - the ES branch we should use to generate the tests and download es
+ *  ES_REF - the ES branch/tag we should use to generate the tests and download es
  *  ES_RELEASE - a specific ES release to download in use for testing
  *  ES_PORT - the port number we should run elasticsearch on
  *  ES_V - a version identifier used by jenkins. don't use this
@@ -45,7 +45,7 @@ task('NODE_UNIT', true, function () {
 });
 
 task('NODE_INTEGRATION', true, function () {
-  var branch = ENV.ES_BRANCH;
+  var branch = ENV.ES_REF;
 
   return node('scripts/generate', '--no-api', '--branch', branch)
   .then(function () {
@@ -134,8 +134,8 @@ execTask('SETUP', function () {
       if (ENV.ES_RELEASE)
         return ['v' + ENV.ES_RELEASE, ENV.ES_RELEASE];
 
-      if (ENV.ES_BRANCH)
-        return [ENV.ES_BRANCH, null];
+      if (ENV.ES_REF)
+        return [ENV.ES_REF, null];
     }
 
     var match;
@@ -149,12 +149,12 @@ execTask('SETUP', function () {
   })
   .then(function readOtherConf(ver) {
     if (!ver)
-      throw new Error('Unable to run the ci script without at least an ES_BRANCH or ES_RELEASE environment var.');
+      throw new Error('Unable to run the ci script without at least an ES_REF or ES_RELEASE environment var.');
 
     log('ES_PORT:', ENV.ES_PORT = parseInt(ENV.ES_PORT || 9400, 10));
 
-    if (ver[0]) log('ES_BRANCH:', ENV.ES_BRANCH = ver[0]);
-    else delete ENV.ES_BRANCH;
+    if (ver[0]) log('ES_REF:', ENV.ES_REF = ver[0]);
+    else delete ENV.ES_REF;
 
     if (ver[1]) log('ES_RELEASE:', ENV.ES_RELEASE = ver[1]);
     else delete ENV.ES_RELEASE;