[Lsb-messages] /var/www/bzr/lsb/devel/puppet-lsb r250: Force small-word environment when needed for chroot build slaves.

[Jeff Licquia]

------------------------------------------------------------
revno: 250
committer: Jeff Licquia <licquia at linuxfoundation.org>
branch nick: puppet-lsb
timestamp: Thu 2012-03-15 12:12:34 -0400
message:
  Force small-word environment when needed for chroot build slaves.
renamed:
  modules/buildbot/files/buildslave.init => modules/buildbot/templates/buildslave.init.erb
modified:
  modules/buildbot/manifests/slave.pp
  modules/buildbot/manifests/slavechroot.pp
  modules/buildbot/manifests/slavepkgs.pp
  modules/buildbot/templates/buildslave.init.erb
-------------- next part --------------
=== modified file 'modules/buildbot/manifests/slave.pp'
--- a/modules/buildbot/manifests/slave.pp	2012-03-15 01:00:04 +0000
+++ b/modules/buildbot/manifests/slave.pp	2012-03-15 16:12:34 +0000
@@ -228,10 +228,10 @@
     }
 
     file { "/etc/init.d/buildslave":
-        ensure => present,
-        source => "puppet:///modules/buildbot/buildslave.init",
-        mode   => 0755,
-        notify => Service['buildslave'],
+        ensure  => present,
+        content => template("buildbot/buildslave.init.erb"),
+        mode    => 0755,
+        notify  => Service['buildslave'],
     }
 
     service { "buildslave":
@@ -248,6 +248,13 @@
 
     if $chroot == 'small' {
 
+        $smallwordcmd = $architecture ? {
+            's390x' => 's390',
+            'ppc64' => 'powerpc32',
+        }
+
+        package { $smallwordpkg: ensure => present }
+
         file { '/usr/bin/gcc-wrapper':
             source => 'puppet:///modules/buildbot/gcc-wrapper',
             mode   => 0755,

=== modified file 'modules/buildbot/manifests/slavechroot.pp'
--- a/modules/buildbot/manifests/slavechroot.pp	2012-03-15 00:31:58 +0000
+++ b/modules/buildbot/manifests/slavechroot.pp	2012-03-15 16:12:34 +0000
@@ -38,6 +38,7 @@
         '/etc/puppet-chroot/modules/buildbot': ensure => directory;
         '/etc/puppet-chroot/modules/buildbot/manifests': ensure => directory;
         '/etc/puppet-chroot/modules/buildbot/files': ensure => directory;
+        '/etc/puppet-chroot/modules/buildbot/templates': ensure => directory;
         '/etc/puppet-chroot/modules/buildbotpw': ensure => directory;
         '/etc/puppet-chroot/modules/buildbotpw/manifests': ensure => directory;
     }
@@ -71,9 +72,9 @@
         require => File['/etc/puppet-chroot/modules/buildbot/manifests'],
     }
 
-    file { '/etc/puppet-chroot/modules/buildbot/files/buildslave.init':
-        source  => 'puppet:///modules/buildbot/buildslave.init',
-        require => File['/etc/puppet-chroot/modules/buildbot/files'],
+    file { '/etc/puppet-chroot/modules/buildbot/templates/buildslave.init.erb':
+        source  => 'puppet:///modules/buildbot/chroot/modules/buildbot/templates/buildslave.init.erb',
+        require => File['/etc/puppet-chroot/modules/buildbot/templates'],
     }
 
     file { '/etc/puppet-chroot/modules/buildbot/files/slavescripts':
@@ -137,7 +138,7 @@
     $bigwordpass = $architecture ? {
         's390x' => $buildbotpw::s390xpassword,
         'ppc64' => $buildbotpw::ppc64password,
-    }    
+    }
 
     file { '/etc/puppet-chroot/modules/buildbotpw/manifests/init_smallword.pp':
         content => template('buildbot/buildbotpw-init-smallword.pp.erb'),

=== modified file 'modules/buildbot/manifests/slavepkgs.pp'
--- a/modules/buildbot/manifests/slavepkgs.pp	2012-03-13 23:46:25 +0000
+++ b/modules/buildbot/manifests/slavepkgs.pp	2012-03-15 16:12:34 +0000
@@ -88,6 +88,13 @@
         default   => 'expect',
     }
 
+    # command for forcing the small-word environment
+    $smallwordpkg = $architecture ? {
+        's390x' => 's390-32',
+        'ppc64' => 'powerpc32',
+        default => '',
+    }
+
     # Most packages needed for a typical slave; see the definitions
     # above for $ucs2anypkg and $xdevelpkg for the interesting ones.
     $pkglist = [ "$lsbpkg", "$rpmpkg", "$gpluspluspkg", "$pkgconfigpkg",

=== renamed file 'modules/buildbot/files/buildslave.init' => 'modules/buildbot/templates/buildslave.init.erb'
--- a/modules/buildbot/files/buildslave.init	2012-02-11 16:09:11 +0000
+++ b/modules/buildbot/templates/buildslave.init.erb	2012-03-15 16:12:34 +0000
@@ -14,6 +14,9 @@
 PRG=buildslave
 DAEMON=/opt/buildbot/bin/$PRG
 USER=buildbot
+<% if chroot == "small" then -%>
+SMALLWORDRUN=<%= smallwordcmd %>
+<% end -%>
 
 test -x $DAEMON || exit 0
 
@@ -23,7 +26,7 @@
 case "$1" in
   start)
     echo -n "Starting $PRG: "
-    /bin/su -c "$DAEMON start /opt/buildbot/lsb-slave 2>>/tmp/buildbot-start.log >/dev/null" $USER
+    /bin/su -c "$SMALLWORDRUN $DAEMON start /opt/buildbot/lsb-slave 2>>/tmp/buildbot-start.log >/dev/null" $USER
     RETVAL=$?
     echo "done"
     ;;