Merge "Cleanup javascript build"

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

@@ -1,7 +1,8 @@
-# The old javascript unit test build, kept while storyboard and vinz
+# Runs Grunt Tests. To use this build, your Gruntfile must declare
-# are migrated forward.
+# a target named test:{name}, such as test:unit, test:integration, or
+# test:functional
 - job-template:
-    name: 'gate-{name}-js-unittests'
+    name: 'gate-{name}-js-test-{test-type}'
 
     wrappers:
       - build-timeout:
@@ -13,109 +14,7 @@
       - revoke-sudo
       - gerrit-git-prep
       - js-build:
-          command: 'test'
+          command: 'test:{test-type}'
-          envlist: 'grunt'
-      - assert-no-extra-files
-
-    publishers:
-      - console-log
-      - coverage-log
-      - scp:
-          site: 'static.openstack.org'
-          files:
-            - target: 'logs/$LOG_PATH'
-              source: 'reports/**'
-              keep-hierarchy: true
-              copy-after-failure: true
-
-              # We're uploading the compiled app as a pre-release sanity check,
-              # much like we do with docs builds.
-            - target: 'docs-draft/$LOG_PATH'
-              source: 'dist/**'
-              keep-hierarchy: true
-              copy-after-failure: false
-    node: '{node}'
-
-# Runs Grunt Unit Tests. To use this build, your Gruntfile must declare
-# a target named test:unit
-- job-template:
-    name: 'gate-{name}-js-test-unit'
-
-    wrappers:
-      - build-timeout:
-          timeout: 40
-      - timestamps
-
-    builders:
-      - npm-install
-      - revoke-sudo
-      - gerrit-git-prep
-      - js-build:
-          command: 'test:unit'
-          envlist: 'grunt'
-          project: '{name}'
-      - assert-no-extra-files
-
-    publishers:
-      - console-log
-      - coverage-log
-      - scp:
-          site: 'static.openstack.org'
-          files:
-            - target: 'logs/$LOG_PATH'
-              source: 'reports/**'
-              keep-hierarchy: true
-              copy-after-failure: true
-    node: '{node}'
-
-# Runs grunt integration tests. To use this build, your Gruntfile must declare
-# a target named test:integration
-- job-template:
-    name: 'gate-{name}-js-test-integration'
-
-    wrappers:
-      - build-timeout:
-          timeout: 40
-      - timestamps
-
-    builders:
-      - npm-install
-      - revoke-sudo
-      - gerrit-git-prep
-      - js-build:
-          command: 'test:integration'
-          envlist: 'grunt'
-          project: '{name}'
-      - assert-no-extra-files
-
-    publishers:
-      - console-log
-      - coverage-log
-      - scp:
-          site: 'static.openstack.org'
-          files:
-            - target: 'logs/$LOG_PATH'
-              source: 'reports/**'
-              keep-hierarchy: true
-              copy-after-failure: true
-    node: '{node}'
-
-# Runs grunt functional tests. To use this build, your Gruntfile must declare
-# a target named test:functional
-- job-template:
-    name: 'gate-{name}-js-test-functional'
-
-    wrappers:
-      - build-timeout:
-          timeout: 40
-      - timestamps
-
-    builders:
-      - npm-install
-      - revoke-sudo
-      - gerrit-git-prep
-      - js-build:
-          command: 'test:functional'
           envlist: 'grunt'
           project: '{name}'
       - assert-no-extra-files

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

@@ -1602,9 +1602,12 @@
     tarball-site: tarballs.openstack.org
 
     jobs:
-      - gate-{name}-js-test-unit
+      - 'gate-{name}-js-test-{test-type}':
-      - gate-{name}-js-test-integration
+          test-type: 'unit'
-      - gate-{name}-js-test-functional
+      - 'gate-{name}-js-test-{test-type}':
+          test-type: 'functional'
+      - 'gate-{name}-js-test-{test-type}':
+          test-type: 'integration'
       - gate-{name}-js-draft
       - '{name}-js-release-{branch-designator}':
           branch-designator: 'master'
@@ -1634,9 +1637,12 @@
     tarball-site: tarballs.openstack.org
 
     jobs:
-      - gate-{name}-js-test-unit
+      - 'gate-{name}-js-test-{test-type}':
-      - gate-{name}-js-test-integration
+          test-type: 'unit'
-      - gate-{name}-js-test-functional
+      - 'gate-{name}-js-test-{test-type}':
+          test-type: 'functional'
+      - 'gate-{name}-js-test-{test-type}':
+          test-type: 'integration'
       - gate-{name}-js-draft
       - '{name}-js-release-{branch-designator}':
           branch-designator: 'master'