[Lsb-messages] /var/www/bzr/lsb/devel/puppet-lsb r148: Install lsb-python on build slaves.

[Jeff Licquia]

------------------------------------------------------------
revno: 148
committer: Jeff Licquia <licquia at linuxfoundation.org>
branch nick: puppet-lsb
timestamp: Sat 2012-02-11 11:06:29 -0500
message:
  Install lsb-python on build slaves.
modified:
  modules/buildbot/manifests/slave.pp
-------------- next part --------------
=== modified file 'modules/buildbot/manifests/slave.pp'
--- a/modules/buildbot/manifests/slave.pp	2012-02-11 03:10:21 +0000
+++ b/modules/buildbot/manifests/slave.pp	2012-02-11 16:06:29 +0000
@@ -51,6 +51,13 @@
 
     $betasdkpath = $releasedsdkpath
 
+    # Which lsb-python do we need?
+
+    $lsbpythonurl = $architecture ? {
+        /^i386$/   => 'http://ftp.linuxfoundation.org/pub/lsb/app-battery/released-4.1/ia32/lsb-python-2.4.6-5.lsb4.i486.rpm',
+        /^x86_64$/ => 'http://ftp.linuxfoundation.org/pub/lsb/app-battery/released-4.1/amd64/lsb-python-2.4.6-5.lsb4.x86_64.rpm',
+    }
+
     # Include required packages for builds here.  Some of these
     # might be included from the base buildbot class; check init.pp
     # for those.
@@ -100,6 +107,24 @@
         ensure => present,
     }
 
+    # Some builds need lsb-python.  For now, this is probably the
+    # best way to get lsb-python to the build slave.
+
+    exec { "download-lsb-python":
+        command => "wget -O lsb-python.rpm $lsbpythonurl",
+        cwd     => '/opt/buildbot',
+        creates => '/opt/buildbot/lsb-python.rpm',
+        path    => [ '/bin', '/sbin', '/usr/bin', '/usr/sbin' ],
+        require => Package['wget'],
+    }
+
+    exec { 'install-lsb-python':
+        command => 'rpm -Uvh /opt/buildbot/lsb-python.rpm',
+        creates => '/opt/lsb/bin/python',
+        path    => [ '/bin', '/sbin', '/usr/bin', '/usr/sbin' ],
+        require => Exec['download-lsb-python'],
+    }
+
     # Other packages needed by this puppet module.
 
     package { 'wget':