From 4b7d6a1598281a1b362bfe43342b176b034fa819 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Fri, 18 Apr 2014 11:44:47 -0700 Subject: [PATCH] Handle feature branches in test-matrix.py test-matrix.py previously treated feature branches as invalid branches. For testing purposes they are equivalent to master so s/feature*/master/ and build the services list that way. Change-Id: Ia40ae64ae6907691cc061c41dc6fe56c646918cc --- test-matrix.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/test-matrix.py b/test-matrix.py index b4a76f6b..e363c2a6 100755 --- a/test-matrix.py +++ b/test-matrix.py @@ -34,7 +34,11 @@ def parse_features(fname): def normalize_branch(branch): - if branch.startswith("stable/"): + if branch.startswith("feature/"): + # Feature branches chase master and should be tested + # as if they were the master branch. + branch = 'master' + elif branch.startswith("stable/"): branch = branch[len("stable/"):] if branch not in ALLOWED_BRANCHES: LOG.error("unknown branch name %s" % branch)