From 1aa7a72ea04d8e5f02cae24ace87057a121f0174 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Wed, 4 Dec 2019 11:02:22 -0600 Subject: [PATCH] Update node to v10 Change-Id: Idd3ae6007f14d4e03c7960431819c7d44df2910b --- .zuul.yaml | 34 +++++++++++++++++----------------- tox.ini | 6 +++--- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 8631683d..29a272ff 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -47,68 +47,68 @@ pass-to-parent: true - job: - name: storyboard-webclient-nodejs-npm8-run-test-functional + name: storyboard-webclient-nodejs-npm-run-test-functional parent: nodejs-npm-run-test description: | Run "test-functional" using nodejs. vars: npm_command: test-functional - node_version: 8 + node_version: 10 - job: - name: storyboard-webclient-nodejs-npm8-run-test-integration + name: storyboard-webclient-nodejs-npm-run-test-integration parent: nodejs-npm-run-test description: | Run "test-integration" using nodejs. vars: npm_command: test-integration - node_version: 8 + node_version: 10 - job: - name: storyboard-webclient-nodejs-npm8-run-test-unit + name: storyboard-webclient-nodejs-npm-run-test-unit parent: nodejs-npm-run-test description: | Run "test-unit" using nodejs. vars: npm_command: test-unit - node_version: 8 + node_version: 10 - project: check: jobs: - nodejs-npm-run-lint: vars: - node_version: 8 - - storyboard-webclient-nodejs-npm8-run-test-unit - - storyboard-webclient-nodejs-npm8-run-test-functional - - storyboard-webclient-nodejs-npm8-run-test-integration + node_version: 10 + - storyboard-webclient-nodejs-npm-run-test-unit + - storyboard-webclient-nodejs-npm-run-test-functional + - storyboard-webclient-nodejs-npm-run-test-integration - build-javascript-content: vars: javascript_content_dir: build npm_command: draft - node_version: 8 + node_version: 10 - opendev-buildset-registry - storyboard-webclient-build-opendev-image gate: jobs: - nodejs-npm-run-lint: vars: - node_version: 8 - - storyboard-webclient-nodejs-npm8-run-test-unit - - storyboard-webclient-nodejs-npm8-run-test-functional - - storyboard-webclient-nodejs-npm8-run-test-integration + node_version: 10 + - storyboard-webclient-nodejs-npm-run-test-unit + - storyboard-webclient-nodejs-npm-run-test-functional + - storyboard-webclient-nodejs-npm-run-test-integration - build-javascript-content: vars: javascript_content_dir: build npm_command: draft - node_version: 8 + node_version: 10 - opendev-buildset-registry - storyboard-webclient-upload-opendev-image post: jobs: - publish-openstack-javascript-content: vars: - node_version: 8 + node_version: 10 promote: jobs: - storyboard-webclient-promote-opendev-image diff --git a/tox.ini b/tox.ini index 4098b752..cd2067b4 100644 --- a/tox.ini +++ b/tox.ini @@ -16,12 +16,12 @@ deps = nodeenv [testenv:venv] commands = - bash ./bin/nodeenv.sh {envdir} 6.10.2 + bash ./bin/nodeenv.sh {envdir} 10.17.0 npm install [testenv:grunt] commands = - bash ./bin/nodeenv.sh {envdir} 6.10.2 + bash ./bin/nodeenv.sh {envdir} 10.17.0 npm install bash ./bin/api.sh create-db bash ./bin/api.sh start @@ -31,7 +31,7 @@ commands = [testenv:grunt_no_api] deps = nodeenv commands = - bash ./bin/nodeenv.sh {envdir} 6.10.2 + bash ./bin/nodeenv.sh {envdir} 10.17.0 npm install npm rebuild node-sass --force {toxinidir}/node_modules/.bin/grunt {posargs}