From cc6c8b6f73f6263e2e69431f34ee1148fe5442d0 Mon Sep 17 00:00:00 2001
From: Dong Ma <winterma.dong@gmail.com>
Date: Tue, 5 Jul 2016 15:11:55 +0800
Subject: [PATCH] nodejs-install macro can install different versions of node

This patch modifies the nodejs-install macro to install based on the
{version} parameter. All current uses of nodejs-install have been set to use
version '4'.

Change-Id: I73a0c5b801137d8700b16acb8375eaabfb668d5f
---
 jenkins/jobs/api-jobs.yaml   |  3 ++-
 jenkins/jobs/javascript.yaml | 15 ++++++++++-----
 jenkins/jobs/macros.yaml     |  5 +++--
 jenkins/jobs/storyboard.yaml |  3 ++-
 4 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/jenkins/jobs/api-jobs.yaml b/jenkins/jobs/api-jobs.yaml
index 416658b3ef..de44b37d76 100644
--- a/jenkins/jobs/api-jobs.yaml
+++ b/jenkins/jobs/api-jobs.yaml
@@ -50,7 +50,8 @@
 
     builders:
       - gerrit-git-prep
-      - nodejs-install
+      - nodejs-install:
+          version: 4
       - install-distro-packages
       - revoke-sudo
       - tox:
diff --git a/jenkins/jobs/javascript.yaml b/jenkins/jobs/javascript.yaml
index b7f3fca7de..3148fdf136 100644
--- a/jenkins/jobs/javascript.yaml
+++ b/jenkins/jobs/javascript.yaml
@@ -18,7 +18,8 @@
           template-name: "{template-name}"
       - gerrit-git-prep
       - install-distro-packages
-      - nodejs-install
+      - nodejs-install:
+          version: 4
       - xvfb-install
       - chrome-install
       - firefox-install
@@ -56,7 +57,8 @@
           template-name: "{template-name}"
       - gerrit-git-prep
       - install-distro-packages
-      - nodejs-install
+      - nodejs-install:
+          version: 4
       - revoke-sudo
 
       # This will build ./{name}-{version}.tgz, where {version} is read from
@@ -95,7 +97,8 @@
           template-name: "{template-name}"
       - gerrit-git-prep
       - install-distro-packages
-      - nodejs-install
+      - nodejs-install:
+          version: 4
       - revoke-sudo
       # This will build ./{name}-{version}.tgz, where {version} is read from
       # package.json.
@@ -147,7 +150,8 @@
     builders:
       - print-template-name:
           template-name: "{template-name}"
-      - nodejs-install
+      - nodejs-install:
+          version: 4
       - gerrit-git-prep
       - install-distro-packages
       - revoke-sudo
@@ -183,7 +187,8 @@
     builders:
       - print-template-name:
           template-name: "{template-name}"
-      - nodejs-install
+      - nodejs-install:
+          version: 4
       - gerrit-git-prep
       - install-distro-packages
       - revoke-sudo
diff --git a/jenkins/jobs/macros.yaml b/jenkins/jobs/macros.yaml
index 3dda8928ac..6bc19877c4 100644
--- a/jenkins/jobs/macros.yaml
+++ b/jenkins/jobs/macros.yaml
@@ -226,6 +226,7 @@
     name: nodejs-install
     builders:
       - shell: |
+          #!/bin/bash -eux
           # Prerequisites
           sudo apt-get update
           sudo apt-get install -y apt-transport-https lsb-release curl
@@ -235,8 +236,8 @@
           # Install via nodesource
           curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | sudo apt-key add -
 
-          echo "deb https://deb.nodesource.com/node_4.x $DISTRO main" | sudo tee /etc/apt/sources.list.d/nodesource.list
-          echo "deb-src https://deb.nodesource.com/node_4.x $DISTRO main" | sudo tee -a /etc/apt/sources.list.d/nodesource.list
+          echo "deb https://deb.nodesource.com/node_{version}.x $DISTRO main" | sudo tee /etc/apt/sources.list.d/nodesource.list
+          echo "deb-src https://deb.nodesource.com/node_{version}.x $DISTRO main" | sudo tee -a /etc/apt/sources.list.d/nodesource.list
 
           sudo apt-get update
           sudo apt-get install -y nodejs
diff --git a/jenkins/jobs/storyboard.yaml b/jenkins/jobs/storyboard.yaml
index b4e2075b77..f62c0f5d3a 100644
--- a/jenkins/jobs/storyboard.yaml
+++ b/jenkins/jobs/storyboard.yaml
@@ -10,7 +10,8 @@
     builders:
       - gerrit-git-prep
       - install-distro-packages
-      - nodejs-install
+      - nodejs-install:
+          version: 4
       - xvfb-install
       - chrome-install
       - shell: |