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
This commit is contained in:
Clark Boylan
2014-04-18 11:44:47 -07:00
parent 633b702cd9
commit 4b7d6a1598

View File

@@ -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)