Combine javascript deployment and deployment-tarball jobs

There's no reason to not just build the tarball when we build the
content.

Set the default value for node_version in the base job.

Change-Id: Ifb3e5138e9ae19ec3de9250f1828fc07230ef739
This commit is contained in:
Monty Taylor 2020-05-12 13:51:05 -05:00 committed by Andreas Jaeger
parent a8722a38ed
commit 886cdcc21f
3 changed files with 11 additions and 36 deletions

View File

@ -3,7 +3,6 @@ Javascript Jobs
.. zuul:autojob:: build-javascript-source-tarball .. zuul:autojob:: build-javascript-source-tarball
.. zuul:autojob:: build-javascript-deployment .. zuul:autojob:: build-javascript-deployment
.. zuul:autojob:: build-javascript-deployment-tarball
.. zuul:autojob:: js-build .. zuul:autojob:: js-build
.. zuul:autojob:: nodejs-run-test .. zuul:autojob:: nodejs-run-test
.. zuul:autojob:: nodejs-run-test-browser .. zuul:autojob:: nodejs-run-test-browser

View File

@ -1,3 +1,10 @@
- name: Set create_tarball_directory from javascript_content_directory
set_fact:
create_tarball_directory: '{{ javascript_content_dir }}'
when:
- create_tarball_directory is not defined
- javascript_content_dir is defined
- name: Create tarball - name: Create tarball
shell: "tar czf {{ ansible_user_dir }}/{{ zuul_work_dir }}/build.tgz *" shell: "tar czf {{ ansible_user_dir }}/{{ zuul_work_dir }}/build.tgz *"
args: args:

View File

@ -68,7 +68,9 @@
name: build-javascript-deployment name: build-javascript-deployment
parent: js-build parent: js-build
description: | description: |
Build javascript web content as it should be deployed. Build javascript web content as it should be deployed. Publishes
a preview site to build logs as well as a tar archive of
that web content.
Responds to these variables: Responds to these variables:
@ -92,39 +94,6 @@
Directory, relative to zuul_work_dir, holding build content. Directory, relative to zuul_work_dir, holding build content.
success-url: npm/html/ success-url: npm/html/
- job:
name: build-javascript-deployment-tarball
parent: js-build
description: |
Build an archive of javascript web content as it should be deployed.
Responds to these variables:
.. zuul:jobvar:: js_build_command
:default: build
Command to pass to npm.
.. zuul:jobvar:: node_version
:default: 14
The version of Node to use.
.. zuul:jobvar:: zuul_work_dir
:default: {{ zuul.project.src_dir }}
Path to operate in.
.. zuul:jobvar:: javascript_content_dir
:default: dist
Directory, relative to zuul_work_dir, holding build content.
.. zuul:jobvar:: create_tarball_directory
Create a tarball with the contents of
create_tarball_directory (relative to zuul_work_dir).
post-run: playbooks/javascript/tarball.yaml post-run: playbooks/javascript/tarball.yaml
- job: - job:
@ -324,7 +293,7 @@
description: | description: |
Build an archive of javascript web content as it should be deployed. Build an archive of javascript web content as it should be deployed.
** DEPRECATED: Please use build-javascript-deployment-tarball ** ** DEPRECATED: Please use build-javascript-deployment **
Responds to these variables: Responds to these variables: