diff options
| -rw-r--r-- | tcwg-benchmark-stm32.yaml | 4 | ||||
| -rw-r--r-- | tcwg-benchmark-tk1.yaml | 4 | ||||
| -rw-r--r-- | tcwg-benchmark-tx1.yaml | 4 | ||||
| -rw-r--r-- | tcwg-benchmark.yaml | 9 | ||||
| -rw-r--r-- | tcwg-benchmark.yaml.in | 9 |
5 files changed, 18 insertions, 12 deletions
diff --git a/tcwg-benchmark-stm32.yaml b/tcwg-benchmark-stm32.yaml index 2ce059cdc4..7e3d900038 100644 --- a/tcwg-benchmark-stm32.yaml +++ b/tcwg-benchmark-stm32.yaml @@ -129,7 +129,7 @@ description: 'Reboot the board before building and running the benchmarks.' - string: name: displaytag - default: '' + default: '#$BUILD_NUMBER' description: 'Tag to display in the Jenkins console, so that the build name is more meaningful' - bool: name: ignore_errors @@ -191,4 +191,4 @@ - archive: artifacts: 'artifacts/**' latest-only: false -# checksum: 829fca9af64d270b4ddfb885adcd086a +# checksum: 1fbd341a1d77a0de4ee1cc97ecee1575 diff --git a/tcwg-benchmark-tk1.yaml b/tcwg-benchmark-tk1.yaml index f4f526a61d..1bf4070683 100644 --- a/tcwg-benchmark-tk1.yaml +++ b/tcwg-benchmark-tk1.yaml @@ -130,7 +130,7 @@ description: 'Reboot the board before building and running the benchmarks.' - string: name: displaytag - default: '' + default: '#$BUILD_NUMBER' description: 'Tag to display in the Jenkins console, so that the build name is more meaningful' - bool: name: ignore_errors @@ -200,4 +200,4 @@ - archive: artifacts: 'artifacts/**' latest-only: false -# checksum: 273a8852bf0b57246ad0d6746db47fcb +# checksum: ed20df860ee735af2f603fd2ed493fb5 diff --git a/tcwg-benchmark-tx1.yaml b/tcwg-benchmark-tx1.yaml index cf0ebdd878..64dba266e5 100644 --- a/tcwg-benchmark-tx1.yaml +++ b/tcwg-benchmark-tx1.yaml @@ -130,7 +130,7 @@ description: 'Reboot the board before building and running the benchmarks.' - string: name: displaytag - default: '' + default: '#$BUILD_NUMBER' description: 'Tag to display in the Jenkins console, so that the build name is more meaningful' - bool: name: ignore_errors @@ -200,4 +200,4 @@ - archive: artifacts: 'artifacts/**' latest-only: false -# checksum: 7d242ebb8b6208da8f2499e8dafd65c0 +# checksum: 53996c70a714e5fa10dd78456ca94540 diff --git a/tcwg-benchmark.yaml b/tcwg-benchmark.yaml index 9736cf0750..d60a6e2989 100644 --- a/tcwg-benchmark.yaml +++ b/tcwg-benchmark.yaml @@ -134,7 +134,7 @@ description: 'Reboot the board before building and running the benchmarks.' - string: name: displaytag - default: '' + default: '#$BUILD_NUMBER' description: 'Tag to display in the Jenkins console, so that the build name is more meaningful' - bool: name: ignore_errors @@ -179,7 +179,7 @@ users: - 'tcwg-benchmark' - build-name: - name: '#$BUILD_NUMBER-$displaytag' + name: '$displaytag' builders: - conditional-step: condition-kind: execution-node @@ -196,9 +196,10 @@ rm -rf artifacts mkdir artifacts - count=0 + count=1 while read -a bmks; do echo "bench_list=${bmks[@]}" > artifacts/bmk-$count-parameters + echo "displaytag=#$BUILD_NUMBER-$bmk_hw-$count" >> artifacts/bmk-$count-parameters echo "bmk_node=tcwg-bmk-$bmk_hw" >> artifacts/bmk-$count-parameters count=$(($count+1)) done < <(./bmk-scripts/break-up-bmks.sh \ @@ -249,4 +250,4 @@ - archive: artifacts: 'artifacts/**' latest-only: false -# checksum: 66426c819c7ec5ea4818489066be7c5c +# checksum: dbb9bb6b1730c381b68ff2cecf7595b3 diff --git a/tcwg-benchmark.yaml.in b/tcwg-benchmark.yaml.in index 86073e8a54..bb07ebd840 100644 --- a/tcwg-benchmark.yaml.in +++ b/tcwg-benchmark.yaml.in @@ -123,7 +123,7 @@ description: 'Reboot the board before building and running the benchmarks.' - string: name: displaytag - default: '' + default: '#$BUILD_NUMBER' description: 'Tag to display in the Jenkins console, so that the build name is more meaningful' - bool: name: ignore_errors @@ -200,7 +200,11 @@ users: - 'tcwg-benchmark' - build-name: +#if !HW_any name: '#$BUILD_NUMBER-$displaytag' +#else + name: '$displaytag' +#endif builders: #if HW_any - conditional-step: @@ -218,9 +222,10 @@ rm -rf artifacts mkdir artifacts - count=0 + count=1 while read -a bmks; do echo "bench_list=${bmks[@]}" > artifacts/bmk-$count-parameters + echo "displaytag=#$BUILD_NUMBER-$bmk_hw-$count" >> artifacts/bmk-$count-parameters echo "bmk_node=tcwg-bmk-$bmk_hw" >> artifacts/bmk-$count-parameters count=$(($count+1)) done < <(./bmk-scripts/break-up-bmks.sh \ |