summaryrefslogtreecommitdiffstats
path: root/scripts/contrib
diff options
context:
space:
mode:
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>2017-02-03 19:53:55 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-02-15 20:06:41 -0800
commit37c9f3f180c018ed031e7cb79d68307cdb9bd515 (patch)
tree5400f9b9b0e5201e73007906ef5f1d552f152f1d /scripts/contrib
parent3c862c647c03df6ed6c01f3d06fc9adf11f0f6da (diff)
downloadpoky-37c9f3f180c018ed031e7cb79d68307cdb9bd515.tar.gz
build-perf-test-wrapper.sh: use oe-git-archive
Start to use the new helper script for archiving results data in Git. [YOCTO #10582] (From OE-Core rev: 3d8a1df37407686ed699485c37c8517f1d79755d) Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/contrib')
-rwxr-xr-xscripts/contrib/build-perf-test-wrapper.sh18
1 files changed, 12 insertions, 6 deletions
diff --git a/scripts/contrib/build-perf-test-wrapper.sh b/scripts/contrib/build-perf-test-wrapper.sh
index a4c19290a7..7788bb1d1a 100755
--- a/scripts/contrib/build-perf-test-wrapper.sh
+++ b/scripts/contrib/build-perf-test-wrapper.sh
@@ -48,8 +48,7 @@ while getopts "ha:c:C:w:" opt; do
48 ;; 48 ;;
49 c) commitish=$OPTARG 49 c) commitish=$OPTARG
50 ;; 50 ;;
51 C) results_repo=`realpath "$OPTARG"` 51 C) results_repo=`realpath -s "$OPTARG"`
52 commit_results=("--commit-results" "$results_repo")
53 ;; 52 ;;
54 w) base_dir=`realpath "$OPTARG"` 53 w) base_dir=`realpath "$OPTARG"`
55 ;; 54 ;;
@@ -130,10 +129,17 @@ fi
130# Run actual test script 129# Run actual test script
131oe-build-perf-test --out-dir "$results_dir" \ 130oe-build-perf-test --out-dir "$results_dir" \
132 --globalres-file "$globalres_log" \ 131 --globalres-file "$globalres_log" \
133 --lock-file "$base_dir/oe-build-perf.lock" \ 132 --lock-file "$base_dir/oe-build-perf.lock"
134 "${commit_results[@]}" \ 133
135 --commit-results-branch "{tester_host}/{git_branch}/$machine" \ 134# Commit results to git
136 --commit-results-tag "{tester_host}/{git_branch}/$machine/{git_commit_count}-g{git_commit}/{tag_num}" 135if [ -n "$results_repo" ]; then
136 echo -e "\nArchiving results in $results_repo"
137 oe-git-archive \
138 --git-dir "$results_repo" \
139 --branch-name "{hostname}/{branch}/{machine}" \
140 --tag-name "{hostname}/{branch}/{machine}/{commit_count}-g{commit}/{tag_number}" \
141 "$results_dir"
142fi
137 143
138case $? in 144case $? in
139 1) echo "ERROR: oe-build-perf-test script failed!" 145 1) echo "ERROR: oe-build-perf-test script failed!"