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.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>

diff --git a/meta/lib/oeqa/buildperf/base.py b/meta/lib/oeqa/buildperf/base.py
index f29c1673073d12d0c229fc57c12c674d97c6640b..97be58f0a1fc39f830bc3b85c9d3fdb2ed2bdb06 100644 (file)
--- 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 cd2758412017625764754b0eaa54e26ea1490f46..35a4839d4d6e43d96876de2eddfdb44191d77056 100755 (executable)
--- 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)