[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4588/8267] build-perf-test-wrapper.sh: use oe-git-archive

[Emmanuele Bassi <ebassi src gnome org>]

commit 37c9f3f180c018ed031e7cb79d68307cdb9bd515
Author: Markus Lehtonen <markus lehtonen linux intel com>
Date:   Fri Feb 3 19:53:55 2017 +0200

    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>

 scripts/contrib/build-perf-test-wrapper.sh |   18 ++++++++++++------
 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 a4c1929..7788bb1 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
             ;;
         c)  commitish=$OPTARG
             ;;
-        C)  results_repo=`realpath "$OPTARG"`
-            commit_results=("--commit-results" "$results_repo")
+        C)  results_repo=`realpath -s "$OPTARG"`
             ;;
         w)  base_dir=`realpath "$OPTARG"`
             ;;
@@ -130,10 +129,17 @@ fi
 # Run actual test script
 oe-build-perf-test --out-dir "$results_dir" \
                    --globalres-file "$globalres_log" \
-                   --lock-file "$base_dir/oe-build-perf.lock" \
-                   "${commit_results[@]}" \
-                   --commit-results-branch "{tester_host}/{git_branch}/$machine" \
-                   --commit-results-tag 
"{tester_host}/{git_branch}/$machine/{git_commit_count}-g{git_commit}/{tag_num}"
+                   --lock-file "$base_dir/oe-build-perf.lock"
+
+# Commit results to git
+if [ -n "$results_repo" ]; then
+    echo -e "\nArchiving results in $results_repo"
+    oe-git-archive \
+        --git-dir "$results_repo" \
+        --branch-name "{hostname}/{branch}/{machine}" \
+        --tag-name "{hostname}/{branch}/{machine}/{commit_count}-g{commit}/{tag_number}" \
+        "$results_dir"
+fi
 
 case $? in
     1)  echo "ERROR: oe-build-perf-test script failed!"