[Lsb-messages] /var/www/bzr/lsb/devel/puppet-lsb r236: Fix a number of issues with chroot build slaves.

[Jeff Licquia]

------------------------------------------------------------
revno: 236
committer: Jeff Licquia <licquia at linuxfoundation.org>
branch nick: puppet-lsb
timestamp: Mon 2012-03-12 18:16:30 -0400
message:
  Fix a number of issues with chroot build slaves.
  
   - Include bzr in the list of copied modules.
  
   - Pull buildbot manifests via the same method as other modules.
  
   - Add files from the buildbot module to the copied stuff.
  
   - Get the proper Java package for s390x.
modified:
  modules/buildbot/manifests/slavechroot.pp
  modules/buildbot/manifests/slavepkgs.pp
-------------- next part --------------
=== modified file 'modules/buildbot/manifests/slavechroot.pp'
--- a/modules/buildbot/manifests/slavechroot.pp	2012-03-12 18:56:47 +0000
+++ b/modules/buildbot/manifests/slavechroot.pp	2012-03-12 22:16:30 +0000
@@ -25,6 +25,7 @@
         '/etc/puppet-chroot/modules': ensure => directory;
         '/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/buildbotpw': ensure => directory;
         '/etc/puppet-chroot/modules/buildbotpw/manifests': ensure => directory;
     }
@@ -39,25 +40,32 @@
     # module manifests in regular Puppet.
 
     file { '/etc/puppet-chroot/modules/buildbot/manifests/init.pp':
-        source  => 'puppet:///modules/buildbot/chroot/buildbot-manifests/init.pp',
+        source  => 'puppet:///modules/buildbot/chroot/modules/buildbot/manifests/init.pp',
         require => File['/etc/puppet-chroot/modules/buildbot/manifests'],
     }
 
     file { '/etc/puppet-chroot/modules/buildbot/manifests/slavepkgs.pp':
-        source  => 'puppet:///modules/buildbot/chroot/buildbot-manifests/slavepkgs.pp',
+        source  => 'puppet:///modules/buildbot/chroot/modules/buildbot/manifests/slavepkgs.pp',
         require => File['/etc/puppet-chroot/modules/buildbot/manifests'],
     }
 
     file { '/etc/puppet-chroot/modules/buildbot/manifests/slave.pp':
-        source  => 'puppet:///modules/buildbot/chroot/buildbot-manifests/slave.pp',
+        source  => 'puppet:///modules/buildbot/chroot/modules/buildbot/manifests/slave.pp',
         require => File['/etc/puppet-chroot/modules/buildbot/manifests'],
     }
 
     file { '/etc/puppet-chroot/modules/buildbot/manifests/virtualenv.pp':
-        source  => 'puppet:///modules/buildbot/chroot/buildbot-manifests/virtualenv.pp',
+        source  => 'puppet:///modules/buildbot/chroot/modules/buildbot/manifests/virtualenv.pp',
         require => File['/etc/puppet-chroot/modules/buildbot/manifests'],
     }
 
+    file { '/etc/puppet-chroot/modules/buildbot/files/slavescripts':
+        ensure  => directory,
+        source  => 'puppet:///modules/buildbot/slavescripts',
+        recurse => true,
+        require => File['/etc/puppet-chroot/modules/buildbot/files'],
+    }
+
     # Other modules.  The way that works here: we link to the general
     # modules directory, and pull in modules explicitly here.
 
@@ -73,6 +81,12 @@
         recurse => true,
     }
 
+    file { '/etc/puppet-chroot/modules/bzr':
+        ensure  => directory,
+        source  => 'puppet:///modules/buildbot/chroot/modules/bzr',
+        recurse => true,
+    }
+
     # For password information, we mock up a buildbotpw module as
     # if from puppet-secrets, but we only include the appropriate
     # user info.

=== modified file 'modules/buildbot/manifests/slavepkgs.pp'
--- a/modules/buildbot/manifests/slavepkgs.pp	2012-03-06 20:12:50 +0000
+++ b/modules/buildbot/manifests/slavepkgs.pp	2012-03-12 22:16:30 +0000
@@ -47,6 +47,7 @@
 
     $javapkg = "$operatingsystem-$architecture" ? {
         /^SLES-x86_64$/ => 'java-1_6_0-ibm',
+        /^SLES-s390x$/  => 'java-1_6_0-ibm',
         /^SLES-ia64$/   => 'java-1_4_2-ibm',
         /^CentOS/ => 'java-1.6.0-openjdk',
         default   => 'openjdk',