From 2238b2dc616e736fd1b35a45e19e7208f0f53359 Mon Sep 17 00:00:00 2001
From: Akihiro Motoki <amotoki@gmail.com>
Date: Thu, 14 May 2020 17:45:21 +0900
Subject: [PATCH] Use new npm jobs in nodejs[468]-jobs templates

commit 202cce830e4e0d63684fefc74dfc8d6aaa9248c6 introduced
new npm jobs. npm jobs on ubuntu-xenial do not work now
as yarn does not work with nodejs <10, so I believe this change
has no negative impact. It is required to fix horizon jobs
in stable/rocky or older.

Change-Id: Ie51711e05e323aebaab67f766eb7189fb16fd322
---
 zuul.d/project-templates.yaml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/zuul.d/project-templates.yaml b/zuul.d/project-templates.yaml
index 1e154a86..b5f5182d 100644
--- a/zuul.d/project-templates.yaml
+++ b/zuul.d/project-templates.yaml
@@ -1649,21 +1649,21 @@
       Run lint and test jobs using Node 4.
     check:
       jobs:
-        - nodejs-npm-run-lint:
+        - nodejs-run-lint:
             vars:
               node_version: 4
             nodeset: ubuntu-xenial
-        - nodejs-npm-run-test:
+        - nodejs-run-test-browser:
             vars:
               node_version: 4
             nodeset: ubuntu-xenial
     gate:
       jobs:
-        - nodejs-npm-run-lint:
+        - nodejs-run-lint:
             vars:
               node_version: 4
             nodeset: ubuntu-xenial
-        - nodejs-npm-run-test:
+        - nodejs-run-test-browser:
             vars:
               node_version: 4
             nodeset: ubuntu-xenial
@@ -1674,18 +1674,18 @@
       Run lint and test jobs using Node 6.
     check:
       jobs:
-        - nodejs-npm-run-lint:
+        - nodejs-run-lint:
             vars:
               node_version: 6
-        - nodejs-npm-run-test:
+        - nodejs-run-test-browser:
             vars:
               node_version: 6
     gate:
       jobs:
-        - nodejs-npm-run-lint:
+        - nodejs-run-lint:
             vars:
               node_version: 6
-        - nodejs-npm-run-test:
+        - nodejs-run-test-browser:
             vars:
               node_version: 6
 
@@ -1695,18 +1695,18 @@
       Run lint and test jobs using Node 8.
     check:
       jobs:
-        - nodejs-npm-run-lint:
+        - nodejs-run-lint:
             vars:
               node_version: 8
-        - nodejs-npm-run-test:
+        - nodejs-run-test-browser:
             vars:
               node_version: 8
     gate:
       jobs:
-        - nodejs-npm-run-lint:
+        - nodejs-run-lint:
             vars:
               node_version: 8
-        - nodejs-npm-run-test:
+        - nodejs-run-test-browser:
             vars:
               node_version: 8