[Lsb-messages] /var/www/bzr/lsb/devel/buildbot-config r346: Remove the System z archs from the low resource list.

[Jeff Licquia]

------------------------------------------------------------
revno: 346
committer: Jeff Licquia <licquia at linuxfoundation.org>
branch nick: buildbot-config
timestamp: Fri 2014-05-09 11:40:43 -0400
message:
  Remove the System z archs from the low resource list.
  
  Also, support the case where the low resource arch list is empty.
modified:
  low-resource-jobs
  lsb_master.cfg
-------------- next part --------------
=== modified file 'low-resource-jobs'
--- a/low-resource-jobs	2013-07-30 03:54:16 +0000
+++ b/low-resource-jobs	2014-05-09 15:40:43 +0000
@@ -24,7 +24,7 @@
 
 # Ultimately, read this from the buildbot config.  For now, though,
 # it's easier just to hard-code.
-low_resource_slave_archs = ["s390", "s390x"]
+low_resource_slave_archs = []
 
 # We use the x86 build list for now, as it should have one of every
 # build minus the arch-independent builds.

=== modified file 'lsb_master.cfg'
--- a/lsb_master.cfg	2014-04-23 20:05:21 +0000
+++ b/lsb_master.cfg	2014-05-09 15:40:43 +0000
@@ -70,7 +70,7 @@
 # these archs on every version control change, and we may limit builds
 # in other ways as well.  Note that the arch independent arch, defined
 # immediately above, CANNOT be part of this list.
-low_resource_archs = ["s390", "s390x"]
+low_resource_archs = []
 
 # Some architectures are served by multiple build slaves; these are
 # listed here.
@@ -435,19 +435,23 @@
 sdk_builder_list = ["build-sdk-" + x
                     for x in lsb_archs + devchk_build_slaves
                     if x not in low_resource_archs]
-low_sdk_builder_list = ["build-sdk-" + x for x in low_resource_archs]
 sch_sdk = scheduler.Scheduler(name="sch-build-sdk",
                               branch="lsb/devel/build_env",
                               builderNames=sdk_builder_list,
                               treeStableTimer=stable_timer_seconds)
-sch_sdk_low = scheduler.Scheduler(name="sch-build-sdk-low",
-                                  branch="lsb/devel/build_env",
-                                  builderNames=low_sdk_builder_list,
-                                  treeStableTimer=slow_stable_timer_seconds)
+
+if low_resource_archs:
+    low_sdk_builder_list = ["build-sdk-" + x for x in low_resource_archs]
+    sch_sdk_low = scheduler.Scheduler(name="sch-build-sdk-low",
+                                      branch="lsb/devel/build_env",
+                                      builderNames=low_sdk_builder_list,
+                                      treeStableTimer=slow_stable_timer_seconds)
 
 # Set up first static set of schedulers.
 
-c['schedulers'] = [sch_jobdir, sch_devchk, sch_sdk, sch_sdk_low]
+c['schedulers'] = [sch_jobdir, sch_devchk, sch_sdk]
+if low_resource_archs:
+    c['schedulers'].append(sch_sdk_low)
 if ForceScheduler:
     c['schedulers'].append(sch_force)