[autotest] Filter out -chrome and -chromium in pfq build for parsing board name
BUG=chromium:639478
TEST=unittest
Change-Id: I9db59c2635883d7399f1e24b0c77a21c10d81608
Reviewed-on: https://chromium-review.googlesource.com/376058
Commit-Ready: Dan Shi <dshi@google.com>
Tested-by: Dan Shi <dshi@chromium.org>
Reviewed-by: Kevin Cheng <kevcheng@chromium.org>
Reviewed-by: Moises Osorio <moisesosorio@google.com>
diff --git a/server/site_utils.py b/server/site_utils.py
index da556bb..d5da31a 100644
--- a/server/site_utils.py
+++ b/server/site_utils.py
@@ -96,8 +96,9 @@
Will be None for relative build names.
"""
- match = re.match(r'(trybot-)?(?P<board>[\w-]+)-(?P<type>\w+)/'
- r'(R(?P<milestone>\d+)-(?P<manifest>[\d.ab-]+)|LATEST)',
+ match = re.match(r'(trybot-)?(?P<board>[\w-]+?)(?:-chrome)?(?:-chromium)?'
+ r'-(?P<type>\w+)/(R(?P<milestone>\d+)-'
+ r'(?P<manifest>[\d.ab-]+)|LATEST)',
name)
if match and len(match.groups()) >= 5:
return (match.group('board'), match.group('type'),
diff --git a/server/site_utils_unittest.py b/server/site_utils_unittest.py
index 57cc534..a44e90d 100644
--- a/server/site_utils_unittest.py
+++ b/server/site_utils_unittest.py
@@ -23,9 +23,12 @@
release_build = 'lumpy-release/R27-3837.0.0'
paladin_build = 'lumpy-paladin/R27-3878.0.0-rc7'
brillo_build = 'git_mnc-brillo-dev/lumpy-eng/1234'
+ chrome_pfq_build = 'lumpy-chrome-pfq/R27-3837.0.0'
+ chromium_pfq_build = 'lumpy-chromium-pfq/R27-3837.0.0'
builds = [trybot_paladin_build, trybot_release_build, release_build,
- paladin_build, brillo_build]
+ paladin_build, brillo_build, chrome_pfq_build,
+ chromium_pfq_build]
test_name = 'login_LoginSuccess'
board = 'lumpy'
suite = 'bvt'