[Lsb-messages] /var/www/bzr/lsb/devel/puppet-lsb r505: Set up slave side of multi-slave arch, and pull in a buildbot bug fix.

[Jeff Licquia]

------------------------------------------------------------
revno: 505
committer: Jeff Licquia <licquia at linuxfoundation.org>
branch nick: puppet-lsb
timestamp: Tue 2013-07-30 00:09:15 -0400
message:
  Set up slave side of multi-slave arch, and pull in a buildbot bug fix.
modified:
  modules/buildbot/manifests/master.pp
  modules/buildbot/manifests/slave.pp
-------------- next part --------------
=== modified file 'modules/buildbot/manifests/master.pp'
--- a/modules/buildbot/manifests/master.pp	2013-07-30 03:13:09 +0000
+++ b/modules/buildbot/manifests/master.pp	2013-07-30 04:09:15 +0000
@@ -4,7 +4,7 @@
 
     include buildbotpw
 
-    $buildbotconfigrev = 'revid:licquia at linuxfoundation.org-20130730030957-85hw6lo66mi7wj2m'
+    $buildbotconfigrev = 'revid:licquia at linuxfoundation.org-20130730035416-rqwbhbjp0srws7az'
 
     $weeklyrebuildarchs = 'x86,x86_64,ia64,ppc32,ppc64'
 

=== modified file 'modules/buildbot/manifests/slave.pp'
--- a/modules/buildbot/manifests/slave.pp	2013-07-11 17:18:23 +0000
+++ b/modules/buildbot/manifests/slave.pp	2013-07-30 04:09:15 +0000
@@ -37,28 +37,47 @@
         }
     }
 
+    # We also have multiple build slaves for s390 and s390x.
+    # Figure out which slave we are by looking at the hostname.
+    # By default, set ourselves up as #1 unless the hostname
+    # matches the hostnames we want as #2; this means that
+    # if we switch the #2 build slaves, we need to fix the
+    # hostname here.  Also, this means that other archs are
+    # set up as #1, which shouldn't matter, but is at least
+    # consistent with reality.
+
+    $slaveid = $hostname ? {
+        'buildslave-s390'  => 'two',
+        'buildslave-s390x' => 'two',
+        default            => 'one',
+    }
+
     # Set up login information.
 
-    $masteruser = "${architecture}-${wordsize}" ? {
-        /^i386/         => 'lfbuild-x86',
-        /^x86_64/       => 'lfbuild-x86_64',
-        /^ia64/         => 'lfbuild-ia64',
-        /^ppc64-small$/ => 'lfbuild-ppc32',
-        /^ppc64-big$/   => 'lfbuild-ppc64',
-        /^s390x-small$/ => 'lfbuild-s390',
-        /^s390x-big$/   => 'lfbuild-s390x',
-        default         => $buildbotpw::masteruser,
+    $masteruser = "${architecture}-${wordsize}-${slaveid}" ? {
+        /^i386/            => 'lfbuild-x86',
+        /^x86_64/          => 'lfbuild-x86_64',
+        /^ia64/            => 'lfbuild-ia64',
+        /^ppc64-small/     => 'lfbuild-ppc32',
+        /^ppc64-big/       => 'lfbuild-ppc64',
+        /^s390x-small-one/ => 'lfbuild-s390',
+        /^s390x-big-one/   => 'lfbuild-s390x',
+        /^s390x-small-two/ => 'lfbuild-s390-2',
+        /^s390x-big-two/   => 'lfbuild-s390x-2',
+        default            => $buildbotpw::masteruser,
     }
 
-    $masterpw = "${architecture}-${wordsize}" ? {
-        /^i386/         => $buildbotpw::x86password,
-        /^x86_64/       => $buildbotpw::x64password,
-        /^ia64/         => $buildbotpw::ia64password,
-        /^ppc64-small$/ => $buildbotpw::ppc32password,
-        /^ppc64-big$/   => $buildbotpw::ppc64password,
-        /^s390x-small$/ => $buildbotpw::s390password,
-        /^s390x-big$/   => $buildbotpw::s390xpassword,
-        default         => $buildbotpw::masterpw,
+    $masterpw = "${architecture}-${wordsize}-${slaveid}" ? {
+        /^i386/            => $buildbotpw::x86password,
+        /^x86_64/          => $buildbotpw::x64password,
+        /^ia64/            => $buildbotpw::ia64password,
+        /^ppc64-small/     => $buildbotpw::ppc32password,
+        /^ppc64-big/       => $buildbotpw::ppc64password,
+        /^s390x-small-one/ => $buildbotpw::s390password,
+        /^s390x-big-one/   => $buildbotpw::s390xpassword,
+        /^s390x-small-two/ => $buildbotpw::s390pwd2,
+        /^s390x-big-two/   => $buildbotpw::s390xpwd2,
+        default            => $buildbotpw::masterpw,
     }
 
     # Which SDKs should we use for released and beta builds?