diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2020-01-15 08:41:18 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2020-01-15 08:41:18 +0000 |
| commit | 164b30259227b88d188f7e37062204ec749eb960 (patch) | |
| tree | a12c1e976a9a76a16889a757820be4350744f605 /tcwg_bmk.yaml | |
| parent | eabeb458bc13009f23433508042d95c3c2902624 (diff) | |
tcwg_bmk: Add support for passing extra build params
... in a generic way. This replaces "benchmarks" parameter.
Change-Id: Ie7deff7a28df3862df6a3bf30201a79da008a9f4
Diffstat (limited to 'tcwg_bmk.yaml')
| -rw-r--r-- | tcwg_bmk.yaml | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/tcwg_bmk.yaml b/tcwg_bmk.yaml index ce6061b8..20cb1f21 100644 --- a/tcwg_bmk.yaml +++ b/tcwg_bmk.yaml @@ -228,6 +228,10 @@ name: default-parameters parameters: - string: + name: extra_build_params + default: "" + description: "Extra parameters to pass to the build script" + - string: name: mail_recipients default: default description: "Comma-separated list of email recipients; use 'default' unless testing" @@ -380,7 +384,8 @@ ==rr[llvm_url] {llvm_url} \ $branch_opt \ ==rr[mode] "jenkins-full" \ - ==rr[update_baseline] "$update_baseline" & + ==rr[update_baseline] "$update_baseline" \ + $extra_build_params & res=0 && wait $! || res=$? if [ $res != 0 ]; then @@ -489,7 +494,8 @@ ==rr[binutils_url] {binutils_url} \ ==rr[gcc_url] {gcc_url} \ ==rr[glibc_url] {glibc_url} \ - ==rr[llvm_url] {llvm_url} + ==rr[llvm_url] {llvm_url} \ + $extra_build_params if [ x"$mail_recipients" != x"default" ]; then echo "$mail_recipients" > artifacts/jenkins/mail-recipients.txt @@ -564,10 +570,6 @@ name: ci_config default: gnu-release-aarch64-spec2k6-O2 description: "CI configuration ID: {toolchain_name}-{toolchain_ver}-{target}-{bmk}-{cflags}" - - string: - name: benchmarks - default: default - description: "Benchmarks to run: spec2k6, c_and_cxx, all, 400.perlbench, etc. Extract from ci_config by default." - llvm-parameters: binutils_url: https://sourceware.org/git/binutils-gdb.git gcc_url: https://github.com/gcc-mirror/gcc.git @@ -628,14 +630,14 @@ --bmk_branch "$bmk_branch" \ ==rr[ci_project] $ci_project \ ==rr[ci_config] $ci_config \ - --benchmarks "$benchmarks" \ ==rr[binutils_url] $binutils_url \ ==rr[gcc_url] $gcc_url \ ==rr[glibc_url] $glibc_url \ ==rr[llvm_url] $llvm_url \ $branch_opt \ ==rr[mode] "jenkins-full" \ - ==rr[update_baseline] "$update_baseline" & + ==rr[update_baseline] "$update_baseline" \ + $extra_build_params & res=0 && wait $! || res=$? if [ $res != 0 ]; then @@ -679,10 +681,6 @@ default: gnu-release-aarch64-spec2k6-O2 description: "CI configuration ID: {toolchain_name}-{toolchain_ver}-{target}-{bmk}-{cflags}" - string: - name: benchmarks - default: default - description: "Benchmarks to run: spec2k6, c_and_cxx, all, 400.perlbench, etc. Extract from ci_config by default." - - string: name: binutils_url default: https://sourceware.org/git/binutils-gdb.git description: "binutils git URL" @@ -761,11 +759,11 @@ --bmk_branch "$bmk_branch" \ ==rr[ci_project] $ci_project \ ==rr[ci_config] $ci_config \ - --benchmarks "$benchmarks" \ ==rr[binutils_url] $binutils_url \ ==rr[gcc_url] $gcc_url \ ==rr[glibc_url] $glibc_url \ - ==rr[llvm_url] $llvm_url + ==rr[llvm_url] $llvm_url \ + $extra_build_params if [ x"$mail_recipients" != x"default" ]; then echo "$mail_recipients" > artifacts/jenkins/mail-recipients.txt |