From b3ec6245cd6dcbec990c8fa7cc187dd499306b49 Mon Sep 17 00:00:00 2001
From: Adam Coldrick <adam.coldrick@codethink.co.uk>
Date: Fri, 15 Mar 2019 08:21:46 +0000
Subject: [PATCH] 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
---
 .eslintignore | 1 +
 .zuul.yaml    | 5 ++++-
 Gruntfile.js  | 4 ++--
 karma.conf.js | 8 ++++----
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.eslintignore b/.eslintignore
index 29c6912e..e0144d75 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -2,3 +2,4 @@ node_modules
 cover
 reports
 dist
+build
\ No newline at end of file
diff --git a/.zuul.yaml b/.zuul.yaml
index 91f36445..e110afe7 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -52,4 +52,7 @@
               node_version: 8
     post:
       jobs:
-        - publish-openstack-javascript-content
+        - publish-openstack-javascript-content:
+            vars:
+              node_version: 8
+              create_tarball_directory: build
diff --git a/Gruntfile.js b/Gruntfile.js
index 8fe63882..d4f16e0d 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -44,7 +44,7 @@ module.exports = function (grunt) {
         source: './src',
         theme: './src/theme',
         test: './test',
-        output: './dist',
+        output: './build',
         report: './reports',
         node_modules: './node_modules',
         fontawesome: './node_modules/@fortawesome/fontawesome-free-webfonts'
@@ -155,7 +155,7 @@ module.exports = function (grunt) {
             },
             theme: {
                 files: {
-                    'dist/styles/main.css': dir.theme + '/main.scss'
+                    'build/styles/main.css': dir.theme + '/main.scss'
                 }
             }
         },
diff --git a/karma.conf.js b/karma.conf.js
index f606d322..769f970b 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -34,10 +34,10 @@ module.exports = function (config) {
         ],
 
         files: [
-            './dist/js/libs.js',
+            './build/js/libs.js',
             './node_modules/angular-mocks/angular-mocks.js',
-            './dist/js/storyboard.js',
-            './dist/js/templates.js',
+            './build/js/storyboard.js',
+            './build/js/templates.js',
             './test/unit/custom_matchers.js',
             './test/unit/**/*.js'
         ],
@@ -54,7 +54,7 @@ module.exports = function (config) {
         browsers: [ 'Firefox' ],
 
         preprocessors: {
-            './dist/js/storyboard.js': ['coverage']
+            './build/js/storyboard.js': ['coverage']
         },
 
         coverageReporter: {