Changeset 5024

Timestamp:

07/23/08 13:52:09 (6 months ago)

Author:

StevenMohr

Message:

added new buildtask tg_ng_setup
added test of build eggs
fixed UploadEggs?

Files:

• build/buildmaster/master.cfg (modified) (4 diffs)
• build/buildmaster/tgbuilder.py (modified) (9 diffs)
• build/buildmaster/tg_mbuildsteps.py (modified) (5 diffs)
• build/buildmaster/tg_sbuildsteps.py (modified) (9 diffs)

build/buildmaster/master.cfg

@@ -74 +74 @@
-#c['schedulers'].append(Periodic('TG',["TG1-full","TG11-full","TG2-full"],60*90))
-c['schedulers'].append(Periodic("core",
-],60*30
+,"TG_NG_SETUP"],60*5
-
-c['schedulers'].append(Periodic("dependencies",
-60*12
+5
-
-
@@ -107 +107 @@
-ftg2   = tg2builder("bin:lib")
-
+ftg_ng = tg_ng_setupbuilder("bin:lib")
+
-############# RuleDispatch ###############
-fruledispatch = dependencybuildersvn("svn://svn.eby-sarna.com/svnroot/RuleDispatch","bin:lib","RuleDispatch",["PyProtocols"])
@@ -183 +185 @@
-      }
-c['builders'].append(b8)
+
+b9 = {'name': "TG_NG_SETUP",
+      'slavenames': py24list+py25list,
+      'builddir': "tgng",
+      'factory': ftg_ng
+      }
+c['builders'].append(b9)
-####### STATUS TARGETS
-
@@ -192 +201 @@
-
-from buildbot.status import html
-
+,allowForce=True
-
-# from buildbot.status import mail

build/buildmaster/tgbuilder.py

@@ -17 +17 @@
-    ftg1 = factory.BuildFactory()
-    ftg1.addStep(source.SVN(mode='clobber',svnurl='http://svn.turbogears.org/branches/1.0'))
-
-
+
+
+
-    ftg1.addStep(InterOSShellCommand,command=["cp","python2.3","python"],description="Rename python23",
-                 workdir="build/bin",flunkOnFailure=False)
@@ -31 +32 @@
-    ftg1.addStep(Nose,verbose=True,testdir="turbogears/tests",description="Running nosetest TG",
-                 env={'PYTHONPATH':pythonpath},haltOnFailure=True)
-Q
+_q
-                 env={'PYTHONPATH':pythonpath})
-    ftg1.addStep(Nose,description="Running nosetest Quickstart",
-                 env={'PYTHONPATH':pythonpath},testdir="build")
-
+
+
+
-    return ftg1
-
@@ -48 +51 @@
-
-    ftg11.addStep(source.SVN(mode='clobber',svnurl='http://svn.turbogears.org/branches/1.1'))
-Quickstarts.py",slavedest="autobuildQ
+_quickstarts.py",slavedest="autobuild_q
-    ftg11.addStep(VirtualEnv,env={'PYTHONPATH':pythonpath},haltOnFailure=True)
-dateSetupCfg.py",slavedest="updateSetupCfg
+load_script.py",slavedest="upload_script
-
-    ftg11.addStep(InterOSShellCommand,command=["cp","python2.3","python"],description="Rename python23",
@@ -65 +68 @@
-    ftg11.addStep(Nose,testdir="turbogears/tests",verbose=True,description="Running nosetest TG",
-                  env={'PYTHONPATH':pythonpath},haltOnFailure=True)
-Q
+_q
-                  env={'PYTHONPATH':pythonpath})
-    ftg11.addStep(Nose,description="Running nosetest Quickstart",env={'PYTHONPATH':pythonpath})
-
-
+
+
+
-    return ftg11
-
@@ -83 +88 @@
-    ftg2.addStep(source.SVN(mode='clobber',svnurl='http://svn.turbogears.org/projects/tgrepozewho/trunk',workdir='build/tgreoz'))
-    ftg2.addStep(source.Mercurial(repourl="https://www.knowledgetap.com/hg/webhelpers",mode='clobber',workdir="build/webhelpers"))
-
+
+
-    ftg2.addStep(VirtualEnv,env={'PYTHONPATH':pythonpath},haltOnFailure=True)
-
@@ -104 +110 @@
-                 env={'PYTHONPATH':newppath},workdir="build/tgdev")
-
-Q
+_q
-                 description="Creating quickstart projects",workdir="build")
-
-upload=True,
+
-                 env={'PYTHONPATH':pythonpath})
+    ftg2.addStep(EasyInstall,env={'PYTHONPATH':pythonpath}, localinstall = True, haltOnFailure = True)
+    ftg2.addStep(UploadEgg,env={'PYTHONPATH':pythonpath},package=["TurboGears 2"])
-    return ftg2
-
@@ -117 +125 @@
-    f = factory.BuildFactory()
-    f.addStep(source.SVN(svnurl=svn_url,mode='clobber'))
+    f.addStep(FileDownload,mastersrc="upload_script.py",slavedest="upload_script.py")
-    f.addStep(VirtualEnv,env={'PYTHONPATH':pythonpath},haltOnFailure=True)
-    f.addStep(EasyInstall,package=["nose"],env={'PYTHONPATH':pythonpath})
@@ -125 +134 @@
-    f.addStep(RunSetup,description="Installing "+name,env={'PYTHONPATH':pythonpath})
-    f.addStep(Python,script="setup.py",script_args=["test"],description="Testing "+name, env={'PYTHONPATH':pythonpath},workdir="build",haltOnFailure=True)
-
+
+
+
-    return f
-
@@ -131 +142 @@
-    """dependencybuilderee creates a build factory which downloads the source of the dependency via easy_install and builds the egg."""
-    f = factory.BuildFactory()
-
+
+
-    f.addStep(VirtualEnv,env={'PYTHONPATH':pythonpath},haltOnFailure=True)
-    f.addStep(EasyInstall,package=["Nose"])
-    #f.addStep(DownloadSourceEE,package=name,env={'PYTHONPATH':pythonpath})
-    #f.addStep(BuildEgg,upload=True,workdir="build/"+name[0],env={'PYTHONPATH':modifyppath(pythonpath,"..")})
-    f.addStep(BuildEggEE,package=name, env={'PYTHONPATH':pythonpath})
+    f.addStep(EasyInstall,env={'PYTHONPATH':pythonpath}, localinstall = True, haltOnFailure = True)
+    f.addStep(UploadEgg,env={'PYTHONPATH':pythonpath},package=name)
+    return f
+
+def tg_ng_setupbuilder(pythonpath):
+    f = factory.BuildFactory()
+    f.addStep(CleanDir)
+    f.addStep(FileDownload,mastersrc="create-tgsetupng.py",slavedest="create-tgsetupng.py")
+    f.addStep(Python,script="create-tgsetupng.py",haltOnFailure=True)
+    f.addStep(Python,script="tgsetupng.py",script_args=["tg"],haltOnFailure=True)
-    return f
-

build/buildmaster/tg_mbuildsteps.py

@@ -53 +53 @@
-                 
-class EasyInstall(BaseStep):
-
+,'localinstall'
-    def __init__(self, *args, **kwargs):
-        BaseStep.__init__(self,  slave_name="EasyInstall", *args, **kwargs)   
@@ -63 +63 @@
-
-class BuildEgg(BaseStep):
- + ['upload'] 
+
-    def __init__(self, *args, **kwargs):
-        BaseStep.__init__(self,  slave_name="BuildEgg", *args, **kwargs)
@@ -73 +73 @@
-        
-class BuildEggEE(BaseStep):
-upload','
+
-    def __init__(self, *args, **kwargs):
-        BaseStep.__init__(self, slave_name="BuildEggEE", *args, **kwargs)
@@ -88 +88 @@
-
-class Paver(BaseStep):
-,'upload'
+
-    def __init__(self, *args, **kwargs):
-        BaseStep.__init__(self,  slave_name="Paver", *args, **kwargs)
@@ -101 +101 @@
-    def __init__(self, *args, **kwargs):
-        BaseStep.__init__(self, slave_name="CleanDir", *args, **kwargs)
+        
+class UploadEgg(BaseStep):
+    parms = BaseStep.parms +['package']
+    def __init__(self, *args, **kwargs):
+        BaseStep.__init__(self, slave_name="UploadEgg", *args, **kwargs)

build/buildmaster/tg_sbuildsteps.py

@@ -15 +15 @@
-    def start(self):
-        args = self.args
-assert args['package'] is not None
+#assert (args['package'] is not None) or (args['localinstall'] is not None)  
-        
-        env = args['env']
@@ -33 +33 @@
-        newworkdir = correctseperator(args['workdir'])
-        workdir = os.path.join(self.builder.basedir,newworkdir)
+        
+        if 'localinstall' in args and args['localinstall']:
+            if os.path.exists(os.path.join(workdir,'dist')):
+                workdir = os.path.join(workdir,'dist')
+            dir_content = os.listdir(workdir)
+            for element in dir_content:
+                if ".egg" in element and os.path.isfile(os.path.join(workdir,element)):
+                        args['package'] = [os.path.join(workdir,element)]
+                
-
-        if 'URL' in args:
@@ -38 +47 @@
-        else:
-            commandline = ["easy_install"]+ args['package']
-#commandline.remove(None)
+
-
-        c = ShellCommand(self.builder, commandline,
@@ -280 +289 @@
-        
-        if 'PATH' in env:
- 
+
-        
-        if os.path.sep == '\\':
@@ -358 +367 @@
-        env = args.get('env')
-        
-
-
+
+
+
+
-        
-        if os.path.sep == '\\':
+            env['PATH'] = correctpathdepth(newworkdir) + 'scripts' + os.path.pathsep + os.getenv("PATH")
+        else:
+            env['PATH'] = correctpathdepth(newworkdir) + 'bin' + os.path.pathsep + os.getenv("PATH")
+        
+        
+        if 'PYTHONPATH' in env:
+            env['PYTHONPATH'] = correctseperator(env['PYTHONPATH'])
+
+
+
+        workdir = os.path.join(self.builder.basedir, newworkdir)
+        commandline = ["paver",args['mode']]
+
+        c = ShellCommand(self.builder, commandline,
+                         workdir, env,
+                         timeout=args.get('timeout', None),
+                         sendStdout=args.get('want_stdout', True),
+                         sendStderr=args.get('want_stderr', True),
+                         sendRC=True,
+                         initialStdin=args.get('initial_stdin'),
+                         keepStdinOpen=args.get('keep_stdin_open'),
+                         logfiles=args.get('logfiles', {}),
+                         )
+        self.command = c
+        d = self.command.start()
+        return d
+registerSlaveCommand("Paver", SlavePaver, command_version)
+
+class SlaveDownloadSourceEE(SlaveShellCommand):
+    def start(self):
+        args = self.args
+        assert 'package' in args
+
+        env = args.get('env')
+        
+        
+        if 'PATH' in env:
+            env['PATH'] = correctseperator(env['PATH']) 
+        if os.sep == '\\':
-            env['PATH'] = 'scripts' + os.path.pathsep + os.getenv("PATH")
-        else:
@@ -368 +418 @@
-        if 'PYTHONPATH' in env:
-            env['PYTHONPATH'] = correctseperator(env['PYTHONPATH'])
-
-        newworkdir = correctseperator(args['workdir'])
-        workdir = os.path.join(self.builder.basedir, newworkdir)
-
-        commandline = ["paver",args['mode']]
-
-        c = ShellCommand(self.builder, commandline,
-                         workdir, env,
-                         timeout=args.get('timeout', None),
-                         sendStdout=args.get('want_stdout', True),
-                         sendStderr=args.get('want_stderr', True),
-                         sendRC=True,
-                         initialStdin=args.get('initial_stdin'),
-                         keepStdinOpen=args.get('keep_stdin_open'),
-                         logfiles=args.get('logfiles', {}),
-                         )
-        self.command = c
-        d = self.command.start()
-        return d
-registerSlaveCommand("Paver", SlavePaver, command_version)
-
-class SlaveDownloadSourceEE(SlaveShellCommand):
-    def start(self):
-        args = self.args
-        assert 'package' in args
-
-        env = args.get('env')
-        
-        
-        if 'PATH' in env:
-            env['PATH'] = correctseperator(env['PATH']) 
-        if os.sep == '\\':
-            env['PATH'] = 'scripts' + os.path.pathsep + os.getenv("PATH")
-        else:
-            env['PATH'] = 'bin' + os.path.pathsep + os.getenv("PATH")
-        
-        if 'PYTHONPATH' in env:
-            env['PYTHONPATH'] = correctseperator(env['PYTHONPATH'])
-        newworkdir = correctseperator(args['workdir'])
-
@@ -432 +444 @@
-    def start(self):
-        args = self.args
-
+
-
-        env = {}
@@ -439 +451 @@
-        workdir = os.path.join(self.builder.basedir, newworkdir)
-        
- + args['package']
+
-
-        c = ShellCommand(self.builder, commandline,
@@ -455 +467 @@
-        return d
-registerSlaveCommand("CleanDir", SlaveCleanDir, command_version)
+
+class SlaveUploadEgg(SlaveShellCommand):
+    def start(self):
+        args = self.args
+        env = {}
+        newworkdir = correctseperator(args['workdir'])
+        workdir = os.path.join(self.builder.basedir, newworkdir)
+        searchdir = workdir
+        if os.path.exists(os.path.join(workdir,'dist')):
+                searchdir = os.path.join(workdir,'dist')
+        dir_content = os.listdir(searchdir)
+        for element in dir_content:
+            if ".egg" in element and os.path.isfile(os.path.join(searchdir,element)):
+                name = os.path.join(searchdir,element)
+        
+        commandline = ["python","upload_script.py"] + args['package'] + [name] 
+
+        c = ShellCommand(self.builder, commandline,
+                         workdir, environ=env,
+                         timeout=args.get('timeout', None),
+                         sendStdout=args.get('want_stdout', True),
+                         sendStderr=args.get('want_stderr', True),
+                         sendRC=True,
+                         initialStdin=args.get('initial_stdin'),
+                         keepStdinOpen=args.get('keep_stdin_open'),
+                         logfiles=args.get('logfiles', {}),
+                         )
+        self.command = c
+        d = self.command.start()
+        return d
+registerSlaveCommand("UploadEgg", SlaveUploadEgg, command_version)