[gnome-continuous-yocto/gnomeostree-3.28-rocko: 2091/8267] oe-build-perf-test: add {git_commit_count} keyword for --commit-results-tag

[Emmanuele Bassi <ebassi src gnome org>]

commit 7155a9b64d859962b66e338703ff83e1a5040b32
Author: Markus Lehtonen <markus lehtonen linux intel com>
Date:   Tue Aug 23 17:08:40 2016 +0300

    oe-build-perf-test: add {git_commit_count} keyword for --commit-results-tag
    
    Makes it possible to create easily sortable tags. Also, the default tag
    format is updated to use the new keyword.
    
    (From OE-Core rev: e3161654d75dfc3b059c519205b38b26e3ffb215)
    
    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>

 meta/lib/oeqa/buildperf/base.py |    1 +
 scripts/oe-build-perf-test      |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/meta/lib/oeqa/buildperf/base.py b/meta/lib/oeqa/buildperf/base.py
index f29c167..97be58f 100644
--- a/meta/lib/oeqa/buildperf/base.py
+++ b/meta/lib/oeqa/buildperf/base.py
@@ -233,6 +233,7 @@ class BuildPerfTestResult(unittest.TextTestResult):
                 # Find tags matching the pattern
                 tag_keywords = dict(git_branch=self.git_branch,
                                     git_commit=self.git_commit,
+                                    git_commit_count=self.git_commit_count,
                                     tester_host=self.hostname,
                                     tag_num='[0-9]{1,5}')
                 tag_re = re.compile(tag.format(**tag_keywords) + '$')
diff --git a/scripts/oe-build-perf-test b/scripts/oe-build-perf-test
index cd27584..35a4839 100755
--- a/scripts/oe-build-perf-test
+++ b/scripts/oe-build-perf-test
@@ -140,7 +140,7 @@ def parse_args(argv):
                         default="{git_branch}",
                         help="Commit results to branch BRANCH.")
     parser.add_argument('--commit-results-tag', metavar='TAG',
-                        default="{git_branch}/{git_commit}/{tag_num}",
+                        default="{git_branch}/{git_commit_count}-g{git_commit}/{tag_num}",
                         help="Tag results commit with TAG.")
 
     return parser.parse_args(argv)