[Lsb-messages] /var/www/bzr/lsb/devel/puppet-lsb r76: Create virtualenv and buildbot installs directly from Puppet.

Jeff Licquia licquia at linuxfoundation.org
Sat Jan 28 01:09:39 UTC 2012


------------------------------------------------------------
revno: 76
committer: Jeff Licquia <licquia at linuxfoundation.org>
branch nick: puppet-lsb
timestamp: Fri 2012-01-27 20:09:39 -0500
message:
  Create virtualenv and buildbot installs directly from Puppet.
modified:
  modules/buildbot/files/Makefile
  modules/buildbot/manifests/init.pp
  modules/buildbot/manifests/master.pp
  modules/buildbot/manifests/slave.pp
-------------- next part --------------
=== modified file 'modules/buildbot/files/Makefile'
--- a/modules/buildbot/files/Makefile	2012-01-27 21:48:45 +0000
+++ b/modules/buildbot/files/Makefile	2012-01-28 01:09:39 +0000
@@ -3,18 +3,8 @@
 # Makefile for buildbot setup on build systems.
 
 BUILDBOT_CONFIG_REPO = http://bzr.linuxfoundation.org/lsb/devel/buildbot-config
-BUILDBOT_VERSION = 0.8.5
 
 TOPLEVEL = $(shell pwd)
 
-bin/python:
-	virtualenv --system-site-packages $(TOPLEVEL)
-
-bin/buildslave: bin/python
-	bin/pip install buildbot-slave==$(BUILDBOT_VERSION)
-
-bin/buildbot: bin/python
-	bin/pip install buildbot==$(BUILDBOT_VERSION)
-
 buildbot-config:
 	bzr checkout $(BUILDBOT_CONFIG_REPO)

=== modified file 'modules/buildbot/manifests/init.pp'
--- a/modules/buildbot/manifests/init.pp	2012-01-26 02:13:29 +0000
+++ b/modules/buildbot/manifests/init.pp	2012-01-28 01:09:39 +0000
@@ -2,6 +2,8 @@
 
     include python::virtualenv
 
+    $buildbotversion = '0.8.5'
+
     # XXX: make needs to be its own module
     #package { 'make':
     #    ensure => present,
@@ -25,4 +27,12 @@
         require => File['/opt/buildbot'],
     }
 
+    exec { "make-buildbot-virtualenv":
+        command => "virtualenv --system-site-packages /opt/buildbot",
+        cwd     => "/opt/buildbot",
+        creates => "/opt/buildbot/bin/pip",
+        path    => [ "/bin", "/sbin", "/usr/bin", "/usr/sbin" ],
+        require => File["/opt/buildbot"],
+    }
+
 }

=== modified file 'modules/buildbot/manifests/master.pp'
--- a/modules/buildbot/manifests/master.pp	2012-01-28 00:34:59 +0000
+++ b/modules/buildbot/manifests/master.pp	2012-01-28 01:09:39 +0000
@@ -1,11 +1,11 @@
 class buildbot::master inherits buildbot {
 
     exec { "make-buildbot":
-        command => "make bin/buildbot",
+        command => "/opt/buildbot/bin/pip install buildbot==$buildbotversion",
         cwd     => "/opt/buildbot",
         creates => "/opt/buildbot/bin/buildbot",
         path    => [ "/bin", "/sbin", "/usr/bin", "/usr/sbin" ],
-        require => File["/opt/buildbot/Makefile"],
+        require => Exec["make-buildbot-virtualenv"],
     }
 
     exec { "make-buildbot-config":

=== modified file 'modules/buildbot/manifests/slave.pp'
--- a/modules/buildbot/manifests/slave.pp	2012-01-26 02:05:56 +0000
+++ b/modules/buildbot/manifests/slave.pp	2012-01-28 01:09:39 +0000
@@ -1,10 +1,11 @@
 class buildbot::slave inherits buildbot {
 
-    exec { "make bin/buildslave":
-        cwd => "/opt/buildbot",
+    exec { "make-buildslave":
+        command => "/opt/buildbot/bin/pip install buildbot-slave==$buildbotversion",
+        cwd     => "/opt/buildbot",
         creates => "/opt/buildbot/bin/buildslave",
         path    => [ "/bin", "/sbin", "/usr/bin", "/usr/sbin" ],
-        require => File["/opt/buildbot/Makefile"],
+        require => Exec["make-buildbot-virtualenv"],
     }
 
 }



More information about the lsb-messages mailing list