diff options
| -rw-r--r-- | tcwg-make-release.yaml | 10 | ||||
| -rw-r--r-- | tcwg-test-release.yaml | 10 |
2 files changed, 16 insertions, 4 deletions
diff --git a/tcwg-make-release.yaml b/tcwg-make-release.yaml index aefa0053ca..85b49c5763 100644 --- a/tcwg-make-release.yaml +++ b/tcwg-make-release.yaml @@ -115,7 +115,7 @@ users: - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a' # tcwg-buildslave - build-name: - name: '#${BUILD_NUMBER}-${target}' + name: '#${BUILD_NUMBER}-${ENV,var="date"}-${ENV,var="target"}' builders: - shell: | #!/bin/bash @@ -188,6 +188,8 @@ tarball_linux_url="http://${fileserver}/binaries/${tcwg_version}-${tcwg_release}/${target}/${tarball_linux}" cat << EOF > tcwg.params.linux tarball_url=${tarball_linux_url} + release=${tcwg_release} + target=${target} EOF if test x"${canadian}" = x"true"; then @@ -195,12 +197,14 @@ tarball_mingw_url="http://${fileserver}/binaries/${tcwg_version}-${tcwg_release}/${target}/${tarball_mingw}" cat << EOF > tcwg.params.mingw tarball_url=${tarball_mingw_url} + release=${tcwg_release} + target=${target} EOF fi - conditional-step: - condition-kind: current-status - steps: + condition-kind: current-status + steps: - trigger-builds: - project: 'tcwg-test-release' property-file: tcwg.params.linux diff --git a/tcwg-test-release.yaml b/tcwg-test-release.yaml index ee9de6238d..9ee7aca29d 100644 --- a/tcwg-test-release.yaml +++ b/tcwg-test-release.yaml @@ -22,6 +22,14 @@ name: abe_branch default: refs/heads/test description: 'ABE revision to use ' + - string: + name: release + default: + description: 'Release name, only display in job name' + - string: + name: target + default: + description: 'Target, only display in job name' - bool: name: debug default: false @@ -49,7 +57,7 @@ users: - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a' # tcwg-buildslave - build-name: - name: '#${BUILD_NUMBER}-${target}' + name: '#${BUILD_NUMBER}-${ENV,var="date"}-${ENV,var="target"}' builders: - shell: | #!/bin/bash |