From 14cf70fb33f08a2ccec96395c2a556d1165982be Mon Sep 17 00:00:00 2001
From: Michael Krotscheck <krotscheck@gmail.com>
Date: Wed, 3 Jun 2015 11:18:54 -0700
Subject: [PATCH] Added javascript job template, included in refstack.

This creates a jobs template for various common npm-based
jobs, and a javascript job template that runs two NPM-based
jobs in the gate.

Change-Id: I26fc5b1f780453202af8d1d43575bbf2aa53d27e
Depends-On: Ibd16775609fbfe8f60a14672a27fb44e84fb63b9
---
 jenkins/jobs/javascript.yaml |  8 ++++++++
 jenkins/jobs/projects.yaml   |  5 +----
 zuul/layout.yaml             | 13 +++++++++----
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/jenkins/jobs/javascript.yaml b/jenkins/jobs/javascript.yaml
index edd69d3baa..c5f859e28b 100644
--- a/jenkins/jobs/javascript.yaml
+++ b/jenkins/jobs/javascript.yaml
@@ -113,3 +113,11 @@
               keep-hierarchy: false
               copy-after-failure: false
     node: '{node}'
+
+- job-group:
+    name: javascript-jobs
+    jobs:
+      - 'gate-{name}-npm-run-{command}':
+          command: 'lint'
+      - 'gate-{name}-npm-run-{command}':
+          command: 'test'
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index e3493ed597..9deaa8455e 100755
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -5381,10 +5381,7 @@
 
     jobs:
       - python-jobs
-      - 'gate-{name}-npm-run-{command}':
-          command: 'lint'
-      - 'gate-{name}-npm-run-{command}':
-          command: 'test-single-run'
+      - javascript-jobs
 
 - project:
     name: refstack-client
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 07a3ae73da..2d2a694b64 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -527,6 +527,14 @@ project-templates:
       - check-tripleo-ironic-overcloud-precise-nonha
       - check-tripleo-ironic-overcloud-f21-nonha
 
+  - name: javascript-jobs
+    check:
+      - gate-{name}-npm-run-lint
+      - gate-{name}-npm-run-test
+    gate:
+      - gate-{name}-npm-run-lint
+      - gate-{name}-npm-run-test
+
 jobs:
   - name: ^.*$
     parameter-function: set_node_options_default_trusty
@@ -7211,15 +7219,12 @@ projects:
   - name: stackforge/refstack
     template:
       - name: merge-check
+      - name: javascript-jobs
     check:
-      - gate-refstack-npm-run-lint
-      - gate-refstack-npm-run-test-single-run
       - gate-refstack-pep8
       - gate-refstack-python27
       - gate-refstack-python34
     gate:
-      - gate-refstack-npm-run-lint
-      - gate-refstack-npm-run-test-single-run
       - gate-refstack-pep8
       - gate-refstack-python27