From e2138467d6241f6c5f67dc1b79510cffecacb9c6 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Fri, 10 Nov 2017 11:58:33 +0100
Subject: [PATCH] Fix npm-run-test

The legacy test installed chromium and xvfb as well and started it,
add these back in for the run-test job.

Closes-Bug: #1731421
Change-Id: I40b7d019551c227e4b8a0e11366b1ce448d5bbed
Co-Authored-By: Akihiro Motoki <amotoki@gmail.com>
---
 playbooks/javascript/pre-test.yaml             | 12 ++++++++++++
 roles/nodejs-test-dependencies/README.rst      |  1 +
 roles/nodejs-test-dependencies/tasks/main.yaml | 12 ++++++++++++
 zuul.yaml                                      |  3 ++-
 4 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 playbooks/javascript/pre-test.yaml
 create mode 100644 roles/nodejs-test-dependencies/README.rst
 create mode 100644 roles/nodejs-test-dependencies/tasks/main.yaml

diff --git a/playbooks/javascript/pre-test.yaml b/playbooks/javascript/pre-test.yaml
new file mode 100644
index 000000000..0abfab9aa
--- /dev/null
+++ b/playbooks/javascript/pre-test.yaml
@@ -0,0 +1,12 @@
+- hosts: all
+  roles:
+    - role: bindep
+      bindep_profile: test
+      bindep_dir: "{{ zuul_work_dir }}"
+    - test-setup
+    - install-nodejs
+    # nodejs-test-dependencies requires sudo,
+    # so we cannot inherit pre.yaml from javascript-base.
+    - nodejs-test-dependencies
+    - revoke-sudo
+    - install-javascript-packages
diff --git a/roles/nodejs-test-dependencies/README.rst b/roles/nodejs-test-dependencies/README.rst
new file mode 100644
index 000000000..e97769e2e
--- /dev/null
+++ b/roles/nodejs-test-dependencies/README.rst
@@ -0,0 +1 @@
+Install test dependencies for Node
diff --git a/roles/nodejs-test-dependencies/tasks/main.yaml b/roles/nodejs-test-dependencies/tasks/main.yaml
new file mode 100644
index 000000000..990f17a67
--- /dev/null
+++ b/roles/nodejs-test-dependencies/tasks/main.yaml
@@ -0,0 +1,12 @@
+- name: Install chromium-brower
+  apt:
+    name: chromium-browser
+  become: true
+
+- name: Install xvfb
+  apt:
+    name: xvfb
+  become: true
+
+- name: Run Xvfb
+  shell: "/usr/bin/Xvfb :99 -screen 0 '1280x1024x24' -ac +extension GLX +render -noreset 2>&1 > /dev/null &"
diff --git a/zuul.yaml b/zuul.yaml
index d77fb7114..190ff5ef3 100644
--- a/zuul.yaml
+++ b/zuul.yaml
@@ -209,7 +209,6 @@
 
 - job:
     name: nodejs-npm-run-test
-    parent: javascript-base
     description: |
       Run test using nodejs.
 
@@ -220,7 +219,9 @@
 
         The version of Node to use.
 
+    pre-run: playbooks/javascript/pre-test.yaml
     run: playbooks/javascript/run-test.yaml
+    post-run: playbooks/javascript/post.yaml
 
 - job:
     name: nodejs-npm-run-lint