[Lsb-messages] /var/www/bzr/lsb/devel/puppet-lsb r521: Correct the generated config to work with new s390(x) slaves.

Jeff Licquia licquia at linuxfoundation.org
Wed Jan 22 16:46:30 UTC 2014


------------------------------------------------------------
revno: 521
committer: Jeff Licquia <licquia at linuxfoundation.org>
branch nick: puppet-lsb
timestamp: Wed 2014-01-22 11:46:30 -0500
message:
  Correct the generated config to work with new s390(x) slaves.
modified:
  modules/buildbot/manifests/slave.pp
-------------- next part --------------
=== modified file 'modules/buildbot/manifests/slave.pp'
--- a/modules/buildbot/manifests/slave.pp	2014-01-02 16:19:19 +0000
+++ b/modules/buildbot/manifests/slave.pp	2014-01-22 16:46:30 +0000
@@ -31,8 +31,10 @@
         $wordsize = $hostname ? {
             'lfdev-build-power32' => 'small',
             'lfdev-build-power64' => 'big',
-            'buildslave-s390'     => 'small',
-            'buildslave-s390x'    => 'big',
+            'lsb-k-b-s390'        => 'small',
+            'lsb-x-s390'          => 'small',
+            'lsb-k-b-s390x'       => 'big',
+            'lsb-x-b-s390x'       => 'big',
             default               => '',
         }
     }
@@ -47,9 +49,9 @@
     # consistent with reality.
 
     $slaveid = $hostname ? {
-        'buildslave-s390'  => 'two',
-        'buildslave-s390x' => 'two',
-        default            => 'one',
+        'lsb-x-s390'    => 'two',
+        'lsb-x-b-s390x' => 'two',
+        default         => 'one',
     }
 
     # Set up login information.



More information about the lsb-messages mailing list