From 284b25191c90fbafbd5e5d66ddd11c158a8b53b9 Mon Sep 17 00:00:00 2001
From: Michael Krotscheck <krotscheck@gmail.com>
Date: Thu, 21 Jul 2016 07:39:09 -0700
Subject: [PATCH] Added version parameter to nodejs jobs

Javascript jobs may now set the version of nodejs they'd like to
run via a parameter in the job's name. This will permit easier
migration to later versions of nodejs.

Change-Id: Id58f8475763f4855b7f5da8c242058bc519a2381
---
 jenkins/jobs/javascript.yaml | 21 ++++++++++++---------
 jenkins/jobs/projects.yaml   | 24 ++++++++++++++++--------
 2 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/jenkins/jobs/javascript.yaml b/jenkins/jobs/javascript.yaml
index ca1effa437..732e2e1db4 100644
--- a/jenkins/jobs/javascript.yaml
+++ b/jenkins/jobs/javascript.yaml
@@ -23,7 +23,7 @@
 # subsequently copied to static.openstack.org (the clickthrough target from
 # gerrit).
 - job-template:
-    name: 'gate-{name}-nodejs4-npm-run-{command}'
+    name: 'gate-{name}-nodejs{version}-npm-run-{command}'
     node: ubuntu-xenial
 
     wrappers:
@@ -37,7 +37,7 @@
       - gerrit-git-prep
       - install-distro-packages
       - nodejs-install:
-          version: 4
+          version: '{version}'
       - xvfb-install
       - chrome-install
       - firefox-install
@@ -67,7 +67,7 @@
 
 # Builds and uploads a tarball using NPM.
 - job-template:
-    name: '{name}-nodejs4-npm-publish-tarball'
+    name: '{name}-nodejs{version}-npm-publish-tarball'
     node: ubuntu-xenial
 
     builders:
@@ -76,7 +76,7 @@
       - gerrit-git-prep
       - install-distro-packages
       - nodejs-install:
-          version: 4
+          version: '{version}'
       - revoke-sudo
 
       # This will build ./{name}-{version}.tgz, where {version} is read from
@@ -107,7 +107,7 @@
 
 # Builds and uploads a draft version of the project to docs-draft.
 - job-template:
-    name: '{name}-nodejs4-npm-publish-draft'
+    name: '{name}-nodejs{version}-npm-publish-draft'
     node: ubuntu-xenial
 
     builders:
@@ -116,7 +116,7 @@
       - gerrit-git-prep
       - install-distro-packages
       - nodejs-install:
-          version: 4
+          version: '{version}'
       - revoke-sudo
       # This will build ./{name}-{version}.tgz, where {version} is read from
       # package.json.
@@ -157,15 +157,18 @@
 - job-group:
     name: nodejs4-jobs
     jobs:
-      - 'gate-{name}-nodejs4-npm-run-{command}':
+      - 'gate-{name}-nodejs{version}-npm-run-{command}':
           command: 'lint'
-      - 'gate-{name}-nodejs4-npm-run-{command}':
+          version: '4'
+      - 'gate-{name}-nodejs{version}-npm-run-{command}':
           command: 'test'
+          version: '4'
 
 - job-group:
     name: nodejs4-publish-to-npm
     jobs:
-      - '{name}-nodejs4-npm-publish-tarball'
+      - '{name}-nodejs{version}-npm-publish-tarball':
+          version: '4'
       - '{name}-npm-upload'
 
 
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 42b91d3416..fa7ecf6fc5 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -3401,9 +3401,11 @@
 
     jobs:
       - nodejs4-jobs
-      - '{name}-nodejs4-npm-publish-tarball'
-      - '{name}-nodejs4-npm-publish-draft':
+      - '{name}-nodejs{version}-npm-publish-tarball':
+          version: '4'
+      - '{name}-nodejs{version}-npm-publish-draft':
           package-dir: 'www' # Grab everything in ./package/www
+          version: '4'
 
 - project:
     name: jacket
@@ -10318,14 +10320,18 @@
     tarball-site: tarballs.openstack.org
 
     jobs:
-      - 'gate-{name}-nodejs4-npm-run-{command}':
+      - 'gate-{name}-nodejs{version}-npm-run-{command}':
           command: 'lint'
-      - 'gate-{name}-nodejs4-npm-run-{command}':
+          version: '4'
+      - 'gate-{name}-nodejs{version}-npm-run-{command}':
           command: 'test-unit'
-      - 'gate-{name}-nodejs4-npm-run-{command}':
+          version: '4'
+      - 'gate-{name}-nodejs{version}-npm-run-{command}':
           command: 'test-functional'
-      - 'gate-{name}-nodejs4-npm-run-{command}':
+          version: '4'
+      - 'gate-{name}-nodejs{version}-npm-run-{command}':
           command: 'test-integration'
+          version: '4'
       - gate-{name}-js-draft
       - '{name}-js-release-{job-suffix}':
           job-suffix: 'master'
@@ -10897,10 +10903,12 @@
     doc-publisher-site: docs.openstack.org
 
     jobs:
-      - 'gate-{name}-nodejs4-npm-run-{command}':
+      - 'gate-{name}-nodejs{version}-npm-run-{command}':
           command: 'test'
-      - 'gate-{name}-nodejs4-npm-run-{command}':
+          version: '4'
+      - 'gate-{name}-nodejs{version}-npm-run-{command}':
           command: 'lint'
+          version: '4'
 
 - project:
     name: tripleo-validations