[Lsb-messages] /var/www/bzr/lsb/devel/puppet-lsb r313: Force version of Twisted for buildbot.

Jeff Licquia licquia at linuxfoundation.org
Thu Jul 19 04:10:48 UTC 2012


------------------------------------------------------------
revno: 313
committer: Jeff Licquia <licquia at linuxfoundation.org>
branch nick: puppet-lsb
timestamp: Thu 2012-07-19 00:10:48 -0400
message:
  Force version of Twisted for buildbot.
  
  pip will attempt to pull in the newest Twisted, even if it's not
  compatible with the installed Python.  Force an old version to ensure
  compatibility.
modified:
  modules/buildbot/manifests/init.pp
  modules/buildbot/manifests/slave.pp
-------------- next part --------------
=== modified file 'modules/buildbot/manifests/init.pp'
--- a/modules/buildbot/manifests/init.pp	2012-03-09 22:15:18 +0000
+++ b/modules/buildbot/manifests/init.pp	2012-07-19 04:10:48 +0000
@@ -3,6 +3,7 @@
     include user::buildbot
 
     $buildbotversion = '0.8.5'
+    $twistedversion = '8.2.0'
 
     $pythonversion = "$operatingsystem-$operatingsystemrelease" ? {
         /^CentOS-5/   => '2.4',

=== modified file 'modules/buildbot/manifests/slave.pp'
--- a/modules/buildbot/manifests/slave.pp	2012-07-10 03:44:44 +0000
+++ b/modules/buildbot/manifests/slave.pp	2012-07-19 04:10:48 +0000
@@ -160,13 +160,22 @@
         owner  => 'buildbot',
     }
 
-    exec { "make-buildslave":
+    exec { "install-twisted":
+        command => "/opt/buildbot/bin/pip install Twisted==$twistedversion",
+        cwd     => "/opt/buildbot",
+        creates => "/opt/buildbot/lib/python$pythonversion/site-packages/twisted/__init__.py",
+        path    => [ "/opt/buildbot/bin", "/bin", "/sbin", "/usr/bin",
+                     "/usr/sbin" ],
+        require => Exec["make-buildbot-virtualenv"],
+    }
+
+    exec { "install-buildslave":
         command => "/opt/buildbot/bin/pip install buildbot-slave==$buildbotversion",
         cwd     => "/opt/buildbot",
         creates => "/opt/buildbot/lib/python$pythonversion/site-packages/buildbot_slave-$buildbotversion-py$pythonversion.egg-info",
         path    => [ "/opt/buildbot/bin", "/bin", "/sbin", "/usr/bin",
                      "/usr/sbin" ],
-        require => Exec["make-buildbot-virtualenv"],
+        require => Exec["install-twisted"],
     }
 
     exec { "make-slave":



More information about the lsb-messages mailing list