From 6abee0d6605fcbc7f3e5aab4bf2cfc99251a9e69 Mon Sep 17 00:00:00 2001
From: Michael Krotscheck <krotscheck@gmail.com>
Date: Thu, 21 Jul 2016 07:48:41 -0700
Subject: [PATCH] Created jobs for nodejs version 6

This patch creates two job groups for nodejs6, as well as job
templates for the same. They follow the exact same pattern as
nodejs version 4 templates, to simplify creating an upgrade path.

These jobs have been set to non-voting, and have been added to
the js-openstack-lib project.

Change-Id: I16f6021d5c713153b505560e47c4783cdee314f9
---
 jenkins/jobs/javascript.yaml | 16 ++++++++++++++++
 jenkins/jobs/projects.yaml   |  1 +
 zuul/layout.yaml             | 14 ++++++++++++++
 3 files changed, 31 insertions(+)

diff --git a/jenkins/jobs/javascript.yaml b/jenkins/jobs/javascript.yaml
index 732e2e1db4..daf833a5e8 100644
--- a/jenkins/jobs/javascript.yaml
+++ b/jenkins/jobs/javascript.yaml
@@ -171,6 +171,22 @@
           version: '4'
       - '{name}-npm-upload'
 
+- job-group:
+    name: nodejs6-jobs
+    jobs:
+      - 'gate-{name}-nodejs{version}-npm-run-{command}':
+          command: 'lint'
+          version: '6'
+      - 'gate-{name}-nodejs{version}-npm-run-{command}':
+          command: 'test'
+          version: '6'
+
+- job-group:
+    name: nodejs6-publish-to-npm
+    jobs:
+      - '{name}-nodejs{version}-npm-publish-tarball':
+          version: '6'
+      - '{name}-npm-upload'
 
 
 ## Legacy Jobs (DEPRECATED)
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 45dbb39fe5..d81d1a74a2 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -3463,6 +3463,7 @@
     jobs:
       - nodejs4-jobs
       - nodejs4-publish-to-npm
+      - nodejs6-jobs
 
 - project:
     name: js-openstack-registry-hooks
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 4cbbb62254..7b1232b674 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1037,6 +1037,16 @@ project-templates:
       - '{name}-nodejs4-npm-publish-tarball':
         - '{name}-npm-upload'
 
+  - name: nodejs6-jobs
+    check:
+      - gate-{name}-nodejs6-npm-run-lint
+      - gate-{name}-nodejs6-npm-run-test
+
+  - name: nodejs6-publish-to-npm
+    release:
+      - '{name}-nodejs6-npm-publish-tarball':
+        - '{name}-npm-upload'
+
   - name: windmill-jobs-centos7
     check:
       - 'gate-windmill-deploy-centos-7'
@@ -2952,6 +2962,9 @@ jobs:
     branch: master
     voting: false
 
+  - name: ^.*-nodejs6-npm-run.*$
+    voting: false
+
   # Mutexes
   - name: reprepro-import-debian-openstack-jessie
     mutex: mirror.deb-openstack
@@ -7638,6 +7651,7 @@ projects:
       - name: merge-check
       - name: nodejs4-jobs
       - name: nodejs4-publish-to-npm
+      - name: nodejs6-jobs
 
   - name: openstack/karma-subunit-reporter
     template: