From b809cc556b0419a7fe630462a88dd22874857e83 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Fri, 15 Dec 2017 17:39:22 +0100
Subject: [PATCH] npm-test needs xvfb etc

The npm-test run for most projects needs the special pre-test job that
the npm changes removed. Readd it to test job.

Also, do no base on nodejs-npm since we need to override the pre script
and do not want both pre scripts to run.

Needed-By: Ibb4d38f150ab8f2029ea704cab0c9719efd57396
Change-Id: Id533690cfad380ceaa88ad08f5c97f35112c8f79
---
 zuul.yaml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/zuul.yaml b/zuul.yaml
index 9b07b5ea9..de191c624 100644
--- a/zuul.yaml
+++ b/zuul.yaml
@@ -284,9 +284,9 @@
 
 - job:
     name: nodejs-npm-run-test
-    parent: nodejs-npm
     description: |
-      Run test using nodejs.
+      Run test using nodejs. This test also starts Xvfb for run time
+      tests.
 
       Responds to these variables:
 
@@ -299,6 +299,11 @@
          :default: {{ zuul.project.src_dir }}
 
          Path to operate in.
+    pre-run: playbooks/javascript/pre-test.yaml
+    run: playbooks/javascript/run.yaml
+    post-run: playbooks/javascript/post.yaml
+    vars:
+      npm_command: test
 
 - job:
     name: nodejs-npm-run-lint