[Lsb-messages] /var/www/bzr/lsb/devel/buildbot-config r337: Handle arch-independent builds before multi-builder builds.

Jeff Licquia licquia at linuxfoundation.org
Fri Aug 2 19:33:14 UTC 2013


------------------------------------------------------------
revno: 337
committer: Jeff Licquia <licquia at linuxfoundation.org>
branch nick: buildbot-config
timestamp: Fri 2013-08-02 15:33:14 -0400
message:
  Handle arch-independent builds before multi-builder builds.
modified:
  lsb_master.cfg
-------------- next part --------------
=== modified file 'lsb_master.cfg'
--- a/lsb_master.cfg	2013-08-02 19:29:05 +0000
+++ b/lsb_master.cfg	2013-08-02 19:33:14 +0000
@@ -664,16 +664,16 @@
     # class we use.)
 
     for prj in lsb_pkg_subdir_projects:
-        if arch in multi_slave_archs:
-            buildslaves = multi_slave_archs[arch]
-            build_arch = arch
-        elif prj in lsb_arch_indep_projects:
+        if prj in lsb_arch_indep_projects:
             if prj in indep_added:
                 continue
             else:
                 buildslaves = ["lfbuild-" + lsb_buildslave_arch_indep_arch]
                 build_arch = lsb_buildslave_arch_indep_arch
                 indep_added.append(prj)
+        elif arch in multi_slave_archs:
+            buildslaves = multi_slave_archs[arch]
+            build_arch = arch
         else:
             buildslaves = ["lfbuild-" + arch]
             build_arch = arch
@@ -735,16 +735,16 @@
     # building those packages.
 
     for (prj, repo) in lsb_packaging_projects:
-        if arch in multi_slave_archs:
-            buildslaves = multi_slave_archs[arch]
-            build_arch = arch
-        elif prj in lsb_arch_indep_projects:
+        if prj in lsb_arch_indep_projects:
             if prj in indep_added:
                 continue
             else:
                 buildslaves = ["lfbuild-" + lsb_buildslave_arch_indep_arch]
                 build_arch = lsb_buildslave_arch_indep_arch
                 indep_added.append(prj)
+        elif arch in multi_slave_archs:
+            buildslaves = multi_slave_archs[arch]
+            build_arch = arch
         else:
             buildslaves = ["lfbuild-" + arch]
             build_arch = arch



More information about the lsb-messages mailing list