Merge "Added NodeJS and NPM to javascript build"

modules/openstack_project/files/jenkins_job_builder/config/javascript.yaml

@@ -7,6 +7,7 @@
       - timestamps
 
     builders:
+      - npm-install
       - revoke-sudo
       - gerrit-git-prep
       - js-build:
@@ -39,6 +40,7 @@
     name: '{name}-js-release-{branch-designator}'
 
     builders:
+      - npm-install
       - revoke-sudo
       - gerrit-git-prep
       - js-build:

modules/openstack_project/files/jenkins_job_builder/config/macros.yaml

@@ -74,6 +74,12 @@
     builders:
       - shell: "/usr/local/jenkins/slave_scripts/run-pylint.sh {github-org} {project}"
 
+- builder:
+    name: npm-install
+    builders:
+      - shell: "sudo apt-get install nodejs npm"
+      - shell: "sudo ln /usr/bin/nodejs /usr/local/bin/node"
+
 - builder:
     name: puppet-lint
     builders:

modules/openstack_project/files/jenkins_job_builder/config/projects.yaml

@@ -1422,7 +1422,7 @@
 - project:
     name: storyboard-webclient
     github-org: openstack-infra
-    node: 'bare-precise || bare-trusty'
+    node: 'bare-trusty'
     tarball-site: tarballs.openstack.org
 
     jobs:
@@ -1445,7 +1445,7 @@
 - project:
     name: vinz-webclient
     github-org: openstack-infra
-    node: 'bare-precise || bare-trusty'
+    node: 'bare-trusty'
     tarball-site: tarballs.openstack.org
 
     jobs:

modules/openstack_project/files/zuul/layout.yaml

@@ -541,8 +541,10 @@ jobs:
   - name: ^gate-.*-docs$
     success-pattern: http://docs-draft.openstack.org/{build.parameters[LOG_PATH]}/doc/build/html/
   - name: gate-storyboard-webclient-js-unittests
+    parameter-function: set_node_options_default_trusty
     success-pattern: http://docs-draft.openstack.org/{build.parameters[LOG_PATH]}/dist/
   - name: gate-vinz-webclient-js-unittests
+    parameter-function: set_node_options_default_trusty
     success-pattern: http://docs-draft.openstack.org/{build.parameters[LOG_PATH]}/dist/
   - name: infra-publications-publish
     branch: ^(?!master).*$