[Lsb-messages] /var/www/bzr/lsb/devel/puppet-lsb r292: Refactor buildbot::slavepkgs a bit, and add some documentation.

Jeff Licquia licquia at linuxfoundation.org
Mon May 21 21:36:20 UTC 2012


------------------------------------------------------------
revno: 292
committer: Jeff Licquia <licquia at linuxfoundation.org>
branch nick: puppet-lsb
timestamp: Mon 2012-05-21 17:36:20 -0400
message:
  Refactor buildbot::slavepkgs a bit, and add some documentation.
modified:
  modules/buildbot/manifests/slave.pp
  modules/buildbot/manifests/slavepkgs.pp
-------------- next part --------------
=== modified file 'modules/buildbot/manifests/slave.pp'
--- a/modules/buildbot/manifests/slave.pp	2012-03-29 20:31:33 +0000
+++ b/modules/buildbot/manifests/slave.pp	2012-05-21 21:36:20 +0000
@@ -87,12 +87,10 @@
     #    ensure => present,
     #}
 
-    define install-xdevel() {
+    define install-pkglist() {
         package { "${name}": ensure => installed }
     }
 
-    install-xdevel { $buildbot::slavepkgs::xdevelpkg: }
-
     # On Red Hat systems, this is the same package as $bdftocfpkg.
     if $operatingsystem !~ /^(Fedora|CentOS)$/ {
         package { "$buildbot::slavepkgs::ucs2anypkg":
@@ -103,9 +101,13 @@
     # Declare most of the package dependencies from buildbot::slavepkgs
     # in one fell swoop.
 
-    package { $buildbot::slavepkgs::pkglist:
-        ensure => present,
-    }
+    install-pkglist { $buildbot::slavepkgs::lsbpkg: }
+
+    install-pkglist { $buildbot::slavepkgs::xdevelpkg: }
+
+    install-pkglist { $buildbot::slavepkgs::pkglist: }
+
+    install-pkglist { $buildbot::slavepkgs::devchklist: }    
 
     # Get special LSB packages needed for builds.
 

=== modified file 'modules/buildbot/manifests/slavepkgs.pp'
--- a/modules/buildbot/manifests/slavepkgs.pp	2012-05-21 20:48:27 +0000
+++ b/modules/buildbot/manifests/slavepkgs.pp	2012-05-21 21:36:20 +0000
@@ -1,5 +1,16 @@
 class buildbot::slavepkgs {
 
+    # How to add packages to LSB build slaves:
+
+    # For easy packages, where there is a single package that provides
+    # what you need, just add the package name to $pkglist at the bottom.
+    # For slightly more complicated packages, create a variable that's
+    # defined by a conditional based on OS name, and add that variable
+    # to $pkglist.  If more than one package is needed (even if that's
+    # for just one OS), create a new list here, and use the macro in
+    # buildbot::slave to install the new list.  See $lsbpkg here and in
+    # buildbot::slave to see an example of defining your own list.
+
     # First, some variable-name packages.
 
     # xts5 is no longer a pure LSB build, needs at least libXi, Xext, Xtst, Xt
@@ -200,11 +211,11 @@
 
     # Most packages needed for a typical slave; see the definitions
     # above for $ucs2anypkg and $xdevelpkg for the interesting ones.
-    $pkglist = [ "$lsbpkg", "$rpmpkg", "$gpluspluspkg", "$pkgconfigpkg",
+    $pkglist = [ "$rpmpkg", "$gpluspluspkg", "$pkgconfigpkg",
                  "$javapkg", 'autoconf', 'automake', 'libtool', 'bison',
                  'flex', "$xgettextpkg", 'rsync', "$bdftopcfpkg",
                  "$intltoolpkg", "$glibdevelpkg", "$pamdevelpkg",
                  "$expectpkg", "$expatdevelpkg", 'perl', 
-                 'ncurses-devel', "$devchklist" ]
+                 'ncurses-devel' ]
 
 }



More information about the lsb-messages mailing list