From aa692b4c32dd1bdad142486a1a219dbffbdc5ece Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Sat, 4 Nov 2017 19:14:12 +0100
Subject: [PATCH] Use nodejs-npm jobs

Use new native nodejs jobs for lint and test in
project-templates. Move nodejs native v3 templates to project-templates
file.

There are some additional project specific legacy nodejs jobs that
install chromium and xvfb in addition, converting them is outside of the
scope of this change.

Note that the legacy template run node6 only in check as voting job, add
it to gate as well now.

Add a TODO to the nodejs docs job templates, they are wrong right now.

Depends-On: I45294049d9228020b70f6b18265e21fa9385f782
Change-Id: Ib38294ab48ef158a248637de79970ef60bc44f7f
---
 zuul.d/jobs.yaml                          |  1 +
 zuul.d/project-templates.yaml             | 42 +++++++++++++++++++++++
 zuul.d/zuul-legacy-project-templates.yaml | 20 ++---------
 3 files changed, 45 insertions(+), 18 deletions(-)

diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 50066e29..ab72f07e 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -434,6 +434,7 @@
     post-run:
       - playbooks/javascript/post.yaml
       - playbooks/javascript/post-tarball.yaml
+
 - job:
     name: announce-release
     description: Send a release announcement after publishing a project
diff --git a/zuul.d/project-templates.yaml b/zuul.d/project-templates.yaml
index f8705b92..358bd514 100644
--- a/zuul.d/project-templates.yaml
+++ b/zuul.d/project-templates.yaml
@@ -717,3 +717,45 @@
       jobs:
         - openstack-tox-pep8
         - openstack-tox-build
+
+- project-template:
+    name: nodejs4-jobs
+    description: |
+      Run lint and test jobs using Node 4.
+    check:
+      jobs:
+        - nodejs-npm-run-lint:
+            vars:
+              node_version: 4
+        - nodejs-npm-run-test:
+            vars:
+              node_version: 4
+    gate:
+      jobs:
+        - nodejs-npm-run-lint:
+            vars:
+              node_version: 4
+        - nodejs-npm-run-test:
+            vars:
+              node_version: 4
+
+- project-template:
+    name: nodejs6-jobs
+    description: |
+      Run lint and test jobs using Node 6.
+    check:
+      jobs:
+        - nodejs-npm-run-lint:
+            vars:
+              node_version: 6
+        - nodejs-npm-run-test:
+            vars:
+              node_version: 6
+    gate:
+      jobs:
+        - nodejs-npm-run-lint:
+            vars:
+              node_version: 6
+        - nodejs-npm-run-test:
+            vars:
+              node_version: 6
diff --git a/zuul.d/zuul-legacy-project-templates.yaml b/zuul.d/zuul-legacy-project-templates.yaml
index 075c156f..e30f0d7a 100644
--- a/zuul.d/zuul-legacy-project-templates.yaml
+++ b/zuul.d/zuul-legacy-project-templates.yaml
@@ -310,6 +310,7 @@
         - legacy-tempest-dsvm-neutron-src-plugin
 
 - project-template:
+    # TODO(jaegerandi): This is broken, should use npm docs
     name: nodejs4-docs
     check:
       jobs:
@@ -318,19 +319,9 @@
       jobs:
         - build-openstack-sphinx-docs
 
-- project-template:
-    name: nodejs4-jobs
-    check:
-      jobs:
-        - legacy-nodejs4-npm-run-lint
-        - legacy-nodejs4-npm-run-test
-    gate:
-      jobs:
-        - legacy-nodejs4-npm-run-lint
-        - legacy-nodejs4-npm-run-test
-
 - project-template:
     name: nodejs6-docs
+    # TODO(jaegerandi): This is broken, should use npm docs
     check:
       jobs:
         - build-openstack-sphinx-docs
@@ -338,13 +329,6 @@
       jobs:
         - build-openstack-sphinx-docs
 
-- project-template:
-    name: nodejs6-jobs
-    check:
-      jobs:
-        - legacy-nodejs6-npm-run-lint
-        - legacy-nodejs6-npm-run-test
-
 - project-template:
     name: noop-jobs
     check: