phase1: make populateTargets() branch aware

Signed-off-by: Thibaut VARÈNE <hacks@slashdirt.org>

diff --git a/phase1/master.cfg b/phase1/master.cfg
index 1064efc2a119e96c616a1a424fc7e4f7b68351f3..9453958d276d61ae351ec9fd26ea3baecda44a1a 100644 (file)
--- a/phase1/master.cfg
+++ b/phase1/master.cfg
@@ -247,27 +247,29 @@ c['prioritizeBuilders'] = prioritizeBuilders
 branchNames = [branches[b]["name"] for b in branches]
 
 # find targets
-targets = [ ]
+targets = set()
 
 def populateTargets():
+       log.msg("Populating targets, this will take time")
        sourcegit = work_dir + '/source.git'
-       if os.path.isdir(sourcegit):
-               subprocess.call(["rm", "-rf", sourcegit])
+       for branch in branchNames:
+               if os.path.isdir(sourcegit):
+                       subprocess.call(["rm", "-rf", sourcegit])
 
-       subprocess.call(["git", "clone", "--depth=1", "--branch="+repo_branch, repo_url, sourcegit])
+               subprocess.call(["git", "clone", "--depth=1", "--branch="+branch, repo_url, sourcegit])
 
-       os.makedirs(sourcegit + '/tmp', exist_ok=True)
-       findtargets = subprocess.Popen(['./scripts/dump-target-info.pl', 'targets'],
-               stdout = subprocess.PIPE, stderr = subprocess.DEVNULL, cwd = sourcegit)
+               os.makedirs(sourcegit + '/tmp', exist_ok=True)
+               findtargets = subprocess.Popen(['./scripts/dump-target-info.pl', 'targets'],
+                       stdout = subprocess.PIPE, stderr = subprocess.DEVNULL, cwd = sourcegit)
 
-       while True:
-               line = findtargets.stdout.readline()
-               if not line:
-                       break
-               ta = line.decode().strip().split(' ')
-               targets.append(ta[0])
+               while True:
+                       line = findtargets.stdout.readline()
+                       if not line:
+                               break
+                       ta = line.decode().strip().split(' ')
+                       targets.add(ta[0])
 
-       subprocess.call(["rm", "-rf", sourcegit])
+               subprocess.call(["rm", "-rf", sourcegit])
 
 populateTargets()
 
@@ -332,7 +334,7 @@ c['schedulers'].append(SingleBranchScheduler(
        name            = "all",
        change_filter   = filter.ChangeFilter(branch=repo_branch),
        treeStableTimer = 60,
-       builderNames    = targets))
+       builderNames    = list(targets)))
 
 c['schedulers'].append(ForceScheduler(
        name         = "force",
@@ -369,7 +371,7 @@ c['schedulers'].append(ForceScheduler(
                                        name    = "target",
                                        label   = "Build target",
                                        default = "all",
-                                       choices = [ "all" ] + targets
+                                       choices = set( "all" ) | targets
                                ),
                                TagChoiceParameter(
                                        name    = "tag",