Merge "Move revoke-sudo from unittest pre to job run"

playbooks/javascript/pre-test.yaml

@@ -1,13 +1,3 @@
 - hosts: all
   roles:
-    - role: bindep
-      bindep_profile: test
-      bindep_dir: "{{ zuul_work_dir }}"
-    - test-setup
-    - install-nodejs
-    - install-yarn
-    # nodejs-test-dependencies requires sudo,
-    # so we cannot inherit pre.yaml from javascript-base.
     - nodejs-test-dependencies
-    - revoke-sudo
-    - install-javascript-packages

playbooks/javascript/pre.yaml

@@ -1,10 +1,5 @@
 - hosts: all
   roles:
-    - role: bindep
-      bindep_profile: test
-      bindep_dir: "{{ zuul_work_dir }}"
-    - test-setup
     - install-nodejs
     - install-yarn
-    - revoke-sudo
     - install-javascript-packages

playbooks/javascript/run.yaml

@@ -1,3 +1,4 @@
 - hosts: all
   roles:
+    - revoke-sudo
     - npm

playbooks/tox/run.yaml

@@ -1,3 +1,4 @@
 - hosts: all
   roles:
+    - revoke-sudo
     - tox

playbooks/unittests/pre.yaml

@@ -3,4 +3,3 @@
     - role: bindep
       bindep_dir: "{{ zuul_work_dir }}"
     - test-setup
-    - revoke-sudo

zuul.yaml

@@ -237,6 +237,7 @@
 
 - job:
     name: nodejs-npm
+    parent: unittests
     description: |
       Base job for javascript operations
 
@@ -323,6 +324,7 @@
 
 - job:
     name: nodejs-npm-run-test
+    parent: nodejs-npm
     description: |
       Run test using nodejs. This test also starts Xvfb for run time
       tests.
@@ -344,8 +346,6 @@
 
          Directory, relative to zuul_work_dir, holding build content.
     pre-run: playbooks/javascript/pre-test.yaml
-    run: playbooks/javascript/run.yaml
-    post-run: playbooks/javascript/post.yaml
     vars:
       npm_command: test