From 05d55380daa48248ed048227461f71cd2c846e5c Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Sun, 19 Jan 2014 10:00:35 -0800
Subject: [PATCH] Genericize javascript release artifact creation

Now that we have tox-based javascript tooling, we can do tox-based
dist creation - which means that we can re-use the tooling for anything
that's grunt based.

Change-Id: I93e87b9c15cabeb9a173edb89927cf301ac24c08
---
 .../config/javascript.yaml                    | 41 +++++++++++++++++++
 .../jenkins_job_builder/config/projects.yaml  |  4 +-
 .../config/storyboard.yaml                    | 33 ---------------
 .../openstack_project/files/zuul/layout.yaml  |  4 +-
 4 files changed, 45 insertions(+), 37 deletions(-)
 delete mode 100644 modules/openstack_project/files/jenkins_job_builder/config/storyboard.yaml

diff --git a/modules/openstack_project/files/jenkins_job_builder/config/javascript.yaml b/modules/openstack_project/files/jenkins_job_builder/config/javascript.yaml
index 44dd27b87b..d7d6a1c7e1 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/javascript.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/javascript.yaml
@@ -9,6 +9,11 @@
 
     builders:
       - gerrit-git-prep
+      - shell: |
+          #!/bin/bash -xe
+          /usr/local/jenkins/slave_scripts/maven-properties.sh
+      - inject:
+          properties-file: maven.properties
       - js-build:
           command: 'test'
           envlist: 'grunt'
@@ -31,3 +36,39 @@
               keep-hierarchy: true
               copy-after-failure: true
     node: '{node}'
+
+- job-template:
+    name: '{name}-js-release-{branch-designator}'
+
+    builders:
+      - gerrit-git-prep
+      - shell: |
+          #!/bin/bash -xe
+          /usr/local/jenkins/slave_scripts/maven-properties.sh
+      - inject:
+          properties-file: maven.properties
+      - js-build:
+          command: 'build'
+          envlist: 'grunt'
+          github-org: '{github-org}'
+          project: '{name}'
+      - shell: |
+          #!/bin/bash -xe
+
+          tar -czf {name}-$PROJECT_VER.tar.gz dist/
+          cp {name}-$PROJECT_VER.tar.gz dist/{name}-latest.tar.gz
+          mv {name}-$PROJECT_VER.tar.gz dist/
+    publishers:
+      - console-log
+      - coverage-log
+      - scp:
+          site: 'static.openstack.org'
+          files:
+            - target: 'logs/$LOG_PATH'
+              source: 'reports/**'
+              keep-hierarchy: true
+              copy-after-failure: true
+      - tarball:
+          project: '{name}'
+          site: '{tarball-site}'
+    node: '{node}'
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
index f73e08b578..90176fe6a1 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -1064,9 +1064,9 @@
 
     jobs:
       - gate-{name}-js-unittests
-      - 'storyboard-webclient-release-{branch-designator}':
+      - '{name}-js-release-{branch-designator}':
           branch-designator: 'master'
-      - 'storyboard-webclient-release-{branch-designator}':
+      - '{name}-js-release-{branch-designator}':
           branch-designator: 'branch'
 
 
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/storyboard.yaml b/modules/openstack_project/files/jenkins_job_builder/config/storyboard.yaml
deleted file mode 100644
index 0bbb740e9c..0000000000
--- a/modules/openstack_project/files/jenkins_job_builder/config/storyboard.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-- job-template:
-    name: 'storyboard-webclient-release-{branch-designator}'
-    node: bare-precise
-
-    builders:
-      - gerrit-git-prep
-      - shell: |
-          ./bin/bootstrap.sh
-          ./bin/build.sh
-      - shell: |
-          #!/bin/bash -xe
-
-          BRANCH={branch-designator}
-          ARCHIVE_NAME={name}
-          if [ "$BRANCH" != "master" ] ; then
-              BRANCH_PATH=`echo $ZUUL_REFNAME | tr / -`
-              ARCHIVE_NAME={name}-$BRANCH_PATH
-          fi
-          tar -czf $ARCHIVE_NAME.tar.gz dist/
-          mv $ARCHIVE_NAME.tar.gz dist/
-    publishers:
-      - console-log
-      - coverage-log
-      - scp:
-          site: 'static.openstack.org'
-          files:
-            - target: 'logs/$LOG_PATH'
-              source: 'reports/**'
-              keep-hierarchy: true
-              copy-after-failure: true
-      - tarball:
-          project: '{name}'
-          site: '{tarball-site}'
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index e508dc3624..8813a9c01c 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -2640,9 +2640,9 @@ projects:
     gate:
       - gate-storyboard-webclient-js-unittests
     post:
-      - storyboard-webclient-release-branch
+      - storyboard-webclient-js-release-branch
     release:
-      - storyboard-webclient-release-master
+      - storyboard-webclient-js-release-master
 
   - name: openstack-infra/tripleo-ci
     check: