Fix post job by setting some variables

`node_version` is set to cause a version of node to be installed that
actually works to build StoryBoard on bionic.

The remaining issue with this job is that zuul currently uploads
everything in the dist/ directory to tarballs.openstack.org. The
output directory of our build script is also modified to not be "dist"
to stop this causing an untarballed webclient being uploaded to
tarballs.openstack.org. `create_tarball_directory` is set in .zuul.yaml
to reflect the new location.

Needed-By: I9f435c12df2b355ac9d735e9eda3f70cc396f1d9
Change-Id: Ia8bf1dc99ee18d31a6d269b243eade71fe519b7d
This commit is contained in:
Adam Coldrick 2019-03-15 08:21:46 +00:00
parent acb4a1cc8c
commit b3ec6245cd
4 changed files with 11 additions and 7 deletions

View File

@ -2,3 +2,4 @@ node_modules
cover cover
reports reports
dist dist
build

View File

@ -52,4 +52,7 @@
node_version: 8 node_version: 8
post: post:
jobs: jobs:
- publish-openstack-javascript-content - publish-openstack-javascript-content:
vars:
node_version: 8
create_tarball_directory: build

View File

@ -44,7 +44,7 @@ module.exports = function (grunt) {
source: './src', source: './src',
theme: './src/theme', theme: './src/theme',
test: './test', test: './test',
output: './dist', output: './build',
report: './reports', report: './reports',
node_modules: './node_modules', node_modules: './node_modules',
fontawesome: './node_modules/@fortawesome/fontawesome-free-webfonts' fontawesome: './node_modules/@fortawesome/fontawesome-free-webfonts'
@ -155,7 +155,7 @@ module.exports = function (grunt) {
}, },
theme: { theme: {
files: { files: {
'dist/styles/main.css': dir.theme + '/main.scss' 'build/styles/main.css': dir.theme + '/main.scss'
} }
} }
}, },

View File

@ -34,10 +34,10 @@ module.exports = function (config) {
], ],
files: [ files: [
'./dist/js/libs.js', './build/js/libs.js',
'./node_modules/angular-mocks/angular-mocks.js', './node_modules/angular-mocks/angular-mocks.js',
'./dist/js/storyboard.js', './build/js/storyboard.js',
'./dist/js/templates.js', './build/js/templates.js',
'./test/unit/custom_matchers.js', './test/unit/custom_matchers.js',
'./test/unit/**/*.js' './test/unit/**/*.js'
], ],
@ -54,7 +54,7 @@ module.exports = function (config) {
browsers: [ 'Firefox' ], browsers: [ 'Firefox' ],
preprocessors: { preprocessors: {
'./dist/js/storyboard.js': ['coverage'] './build/js/storyboard.js': ['coverage']
}, },
coverageReporter: { coverageReporter: {