diff options
| author | Renato Golin <renato.golin@linaro.org> | 2017-04-25 22:38:33 +0100 |
|---|---|---|
| committer | Renato Golin <renato.golin@linaro.org> | 2017-04-26 09:51:40 +0000 |
| commit | 21e647ff543a253986140759298dc678e9676bad (patch) | |
| tree | 3a0c99c0c55085ab3b8d09a43e8c1248fcb033cd /tcwg-llvm-staged-build.yaml | |
| parent | e4ef064d05350ed11d3cc2c5cf9e21167e225c99 (diff) | |
tcwg-llvm-staged-build.yaml: Simplify buildid/revision/url
Change-Id: Ifeccf098fcd4e67855c6e4a4a43e6055805f4dc7
Diffstat (limited to 'tcwg-llvm-staged-build.yaml')
| -rw-r--r-- | tcwg-llvm-staged-build.yaml | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/tcwg-llvm-staged-build.yaml b/tcwg-llvm-staged-build.yaml index a5e1f633e8..b270a0210a 100644 --- a/tcwg-llvm-staged-build.yaml +++ b/tcwg-llvm-staged-build.yaml @@ -85,19 +85,23 @@ # Setup job parameters and run linkjobs=7 + buildid="ci${BUILD_ID}" + if ! -z ${revision}; then + buildid=${revision} + fi ${BUILD_CONTAINER} "cd ${WORKSPACE} && bash -x ${WORKSPACE}/tcwg-llvm-build.sh \ --workspace=${WORKSPACE} \ - --buildid=${BUILD_ID} \ + --buildid=${buildid} \ --linkjobs=${linkjobs} \ --revision=${revision} \ --toolchain=${toolchain}" - # Chained jobs (FIXME: handle version/targets) + # Chained jobs (FIXME: handle targets) fileserver=dev-01.tcwglab - url_prefix='~tcwg-buildslave/builds/binaries' - target=clang+llvm-5.0.0-ci${BUILD_ID}-x86_64-unknown-linux-gnu + url_prefix='~tcwg-buildslave/builds/binaries/llvm' + target=clang+llvm-${buildid}-x86_64-unknown-linux-gnu tarball=${target}.tar.xz - toolchain_url="http://${fileserver}/${url_prefix}/${target}/${tarball}" + toolchain_url="http://${fileserver}/${url_prefix}/${tarball}" # We don't want an infinite chain, so make sure the 3rd stage is off if ${twostage}; then |