[Checkins] SVN: zope.wineggbuilder/trunk/ adjusted for github repos

Adam Groszer cvs-admin at zope.org
Tue Jan 8 10:19:01 UTC 2013


Log message for revision 129025:
  adjusted for github repos

Changed:
  U   zope.wineggbuilder/trunk/master.cfg
  U   zope.wineggbuilder/trunk/project-list.cfg

-=-
Modified: zope.wineggbuilder/trunk/master.cfg
===================================================================
--- zope.wineggbuilder/trunk/master.cfg	2013-01-05 19:21:58 UTC (rev 129024)
+++ zope.wineggbuilder/trunk/master.cfg	2013-01-08 10:19:00 UTC (rev 129025)
@@ -948,7 +948,7 @@
     del ZODB_DEV_PLATFORMS['py_254_win32']
 
 
-def ZODB_dev_builder(name, slavename, platform, locks):
+def ZODB_dev_builder_svn(name, slavename, platform, locks):
     builddir = name.replace(' ', '_')
     f = factory.BuildFactory()
     f.addStep(SVN(
@@ -990,6 +990,43 @@
                 locks=locks)
 
 
+def ZODB_dev_builder_git(name, slavename, platform, locks):
+    branch = 'HEAD'
+    builddir = name.replace(' ', '_')
+    f = factory.BuildFactory()
+    f.addStep(Git(
+              repourl="git://github.com/zopefoundation/ZODB.git",
+              haltOnFailure=True,
+              mode="copy",
+              branch=branch))
+
+    lc = LastChangeGit()
+    #lc.url_template = 'http://zope3.pov.lt/trac/log/zc.buildout?rev=%s'
+    f.addStep(lc)
+
+    f.addStep(shell.ShellCommand(
+              command=[platform.python, r"c:\buildmaster\bootstrap.py"],
+              haltOnFailure=True,
+              name="bootstrap",
+              description="bootstrap"))
+    f.addStep(shell.ShellCommand(
+              command=platform.withcompiler % r"bin\buildout.exe",
+              haltOnFailure=True,
+              name="buildout",
+              description="buildout",
+              timeout=3600))
+    f.addStep(Test(
+              command=[r"bin\test.exe", "--exit-with-status", "-1"],
+              haltOnFailure=False,
+              name="test",
+              description="test trunk"))
+    return dict(name=name,
+                slavename=slavename,
+                builddir=builddir,
+                factory=f,
+                locks=locks)
+
+
 def setup_ZODB_dev_tests(slow_lock, hour=02, minute=40):
     #hour = 02
     #minute = 40
@@ -999,7 +1036,7 @@
         name = "ZODB_dev %s" % platform.name
         builders.append(name)
         c['builders'].append(
-            ZODB_dev_builder(name, 'local', platform, [slow_lock]))
+            ZODB_dev_builder_git(name, 'local', platform, [slow_lock]))
 
         c['schedulers'].append(
             Nightly( "%s_nightly" % name, [name], hour=hour, minute=minute))
@@ -1097,14 +1134,10 @@
     return ("%s/%s" % (project, branch), "/".join(pieces[2:]))
 
 
-def bsquare_make_factory(svn_url, platform):
+def bsquare_make_factory_svn(svn_url, platform):
     f = factory.BuildFactory()
     f.addStep(SVN(baseURL=svn_url, mode='copy'))
 
-    #f.addStep(Compile(name='bootstrap',
-    #            command='buildout bootstrap .',
-    #            description=['bootstrapping'],
-    #            descriptionDone=['bootstrap']))
     f.addStep(shell.ShellCommand(
               command=[platform.python, r"c:\buildmaster\bootstrap.py"],
               haltOnFailure=True,
@@ -1127,11 +1160,42 @@
     return f
 
 
+def bsquare_make_factory_git(git_url, platform):
+    f = factory.BuildFactory()
+    f.addStep(Git(
+              repourl=git_url,
+              haltOnFailure=True,
+              mode="copy"))
+
+    f.addStep(shell.ShellCommand(
+              command=[platform.python, r"c:\buildmaster\bootstrap.py"],
+              haltOnFailure=True,
+              name="bootstrap",
+              description="bootstrap"))
+
+    f.addStep(shell.ShellCommand(
+              command=platform.withcompiler % r"bin\buildout.exe",
+              haltOnFailure=True,
+              name="buildout",
+              description="buildout",
+              timeout=3600))
+
+    f.addStep(Test(name="test",
+                command="bin\\test.exe --exit-with-status -1",
+                description=['testing'],
+                descriptionDone=['tests']))
+
+    f.treeStableTimer = 300
+    return f
+
+
+# XXX:
+# XXX: needs a total cleanup!
 def bsquare_configure(c,
-              svn_url, http_port=8010, allowForce=False,
+              svn_url=None, http_port=8010, allowForce=False,
               svnuser=None, svnpasswd=None,
               pollinterval=30, nightlyhour=None,
-              poller=None, makefactory=bsquare_make_factory,
+              poller=None, makefactory=bsquare_make_factory_svn,
               maxConcurrent=2,
               svnbin='svn',
               slow_lock=None):
@@ -1161,12 +1225,13 @@
 
     """
     if poller is None:
-        c['change_source'] = SVNPoller(svn_url,
-                                       split_file=bsquare_split_file,
-                                       svnuser=svnuser,
-                                       svnpasswd=svnpasswd,
-                                       pollinterval=pollinterval,
-                                       svnbin=svnbin)
+        if svn_url:
+            c['change_source'] = SVNPoller(svn_url,
+                                           split_file=bsquare_split_file,
+                                           svnuser=svnuser,
+                                           svnpasswd=svnpasswd,
+                                           pollinterval=pollinterval,
+                                           svnbin=svnbin)
     else:
         c['change_source'] = poller
 
@@ -1182,13 +1247,23 @@
         if not project or project.startswith('#'):
             continue  # comment or empty line
 
+        project, repourl = project.split(',')
+        project = project.strip()
+        repourl = repourl.strip()
+
         for bsquare_platname, bsquare_platform in platforms.items():
-            if isinstance(makefactory, dict):
-                f = makefactory.get(project,
-                                    makefactory.get('__default__', makefactory))
-                f = f(svn_url, platform=bsquare_platform)
+            #if isinstance(makefactory, dict):
+            #    f = makefactory.get(project,
+            #                        makefactory.get('__default__', makefactory))
+            #    f = f(repourl, platform=bsquare_platform)
+            #else:
+            #    f = makefactory(repourl, platform=bsquare_platform)
+            isgit = repourl.lower().startswith('git')
+            if isgit:
+                makefactory = bsquare_make_factory_git
             else:
-                f = makefactory(svn_url, platform=bsquare_platform)
+                makefactory = bsquare_make_factory_svn
+            f = makefactory(repourl, platform=bsquare_platform)
 
             bname = '%s_%s' % (project, bsquare_platname)
 
@@ -1208,9 +1283,13 @@
                 builderNames=[bname]))
 
             if nightlyhour is not None:
-                c['schedulers'].append(Nightly(
-                    "%s nightly" % project, [bname], hour=[nightlyhour],
-                    branch="%s/trunk" % project))
+                if isgit:
+                    c['schedulers'].append(Nightly(
+                        "%s nightly" % project, [bname], hour=[nightlyhour]))
+                else:
+                    c['schedulers'].append(Nightly(
+                        "%s nightly" % project, [bname], hour=[nightlyhour],
+                        branch="%s/trunk" % project))
 
             c['status'].append(
               MailNotifier(mode="failing",
@@ -1252,7 +1331,6 @@
 setup_BB_dev_tests(slow_lock, hour=21, minute=55)
 
 bsquare_configure(c,
-              'svn://svn.zope.org/repos/main/',
               pollinterval = 300,
               nightlyhour=23,
               slow_lock = slow_lock,

Modified: zope.wineggbuilder/trunk/project-list.cfg
===================================================================
--- zope.wineggbuilder/trunk/project-list.cfg	2013-01-05 19:21:58 UTC (rev 129024)
+++ zope.wineggbuilder/trunk/project-list.cfg	2013-01-08 10:19:00 UTC (rev 129025)
@@ -1,154 +1,156 @@
 #ZTK:
-zope.annotation
-zope.applicationcontrol
-zope.authentication
-zope.browser
-zope.browsermenu
-zope.browserpage
-zope.browserresource
-zope.cachedescriptors
-zope.catalog
-zope.component
-zope.componentvocabulary
-zope.configuration
-zope.container
-zope.contentprovider
-zope.contenttype
-zope.copy
-zope.copypastemove
-zope.datetime
-zope.deferredimport
-zope.deprecation
-zope.dottedname
-zope.dublincore
-zope.error
-zope.event
-zope.exceptions
-zope.filerepresentation
-zope.formlib
-zope.hookable
-zope.i18n
-zope.i18nmessageid
-zope.index
-zope.interface
-zope.intid
-zope.keyreference
-zope.lifecycleevent
-zope.location
-zope.login
-zope.mimetype
-zope.minmax
-zope.pagetemplate
-zope.password
-zope.pluggableauth
-zope.principalannotation
-zope.principalregistry
-zope.processlifetime
-zope.proxy
-zope.ptresource
-zope.publisher
-zope.ramcache
-zope.schema
-zope.security
-zope.securitypolicy
-zope.sendmail
-zope.sequencesort
-zope.server
-zope.session
-zope.site
-zope.size
-zope.structuredtext
-zope.tal
-zope.tales
-zope.testing
-zope.testrunner
-zope.traversing
-zope.viewlet
+zope.annotation,svn://svn.zope.org/repos/main/zope.annotation
+zope.applicationcontrol,svn://svn.zope.org/repos/main/zope.applicationcontrol
+zope.authentication,svn://svn.zope.org/repos/main/zope.authentication
+zope.browser,svn://svn.zope.org/repos/main/zope.browser
+zope.browsermenu,svn://svn.zope.org/repos/main/zope.browsermenu
+zope.browserpage,svn://svn.zope.org/repos/main/zope.browserpage
+zope.browserresource,svn://svn.zope.org/repos/main/zope.browserresource
+zope.cachedescriptors,svn://svn.zope.org/repos/main/zope.cachedescriptors
+zope.catalog,svn://svn.zope.org/repos/main/zope.catalog
+zope.component,svn://svn.zope.org/repos/main/zope.component
+zope.componentvocabulary,svn://svn.zope.org/repos/main/zope.componentvocabulary
+zope.configuration,svn://svn.zope.org/repos/main/zope.configuration
+zope.container,svn://svn.zope.org/repos/main/zope.container
+zope.contentprovider,svn://svn.zope.org/repos/main/zope.contentprovider
+zope.contenttype,svn://svn.zope.org/repos/main/zope.contenttype
+zope.copy,svn://svn.zope.org/repos/main/zope.copy
+zope.copypastemove,svn://svn.zope.org/repos/main/zope.copypastemove
+zope.datetime,svn://svn.zope.org/repos/main/zope.datetime
+zope.deferredimport,svn://svn.zope.org/repos/main/zope.deferredimport
+zope.deprecation,svn://svn.zope.org/repos/main/zope.deprecation
+zope.dottedname,svn://svn.zope.org/repos/main/zope.dottedname
+zope.dublincore,svn://svn.zope.org/repos/main/zope.dublincore
+zope.error,svn://svn.zope.org/repos/main/zope.error
+zope.event,svn://svn.zope.org/repos/main/zope.event
+zope.exceptions,svn://svn.zope.org/repos/main/zope.exceptions
+zope.filerepresentation,svn://svn.zope.org/repos/main/zope.filerepresentation
+zope.formlib,svn://svn.zope.org/repos/main/zope.formlib
+zope.hookable,svn://svn.zope.org/repos/main/zope.hookable
+zope.i18n,svn://svn.zope.org/repos/main/zope.i18n
+zope.i18nmessageid,svn://svn.zope.org/repos/main/zope.i18nmessageid
+zope.index,svn://svn.zope.org/repos/main/zope.index
+zope.interface,svn://svn.zope.org/repos/main/zope.interface
+zope.intid,svn://svn.zope.org/repos/main/zope.intid
+zope.keyreference,svn://svn.zope.org/repos/main/zope.keyreference
+zope.lifecycleevent,svn://svn.zope.org/repos/main/zope.lifecycleevent
+zope.location,svn://svn.zope.org/repos/main/zope.location
+zope.login,svn://svn.zope.org/repos/main/zope.login
+zope.mimetype,svn://svn.zope.org/repos/main/zope.mimetype
+zope.minmax,svn://svn.zope.org/repos/main/zope.minmax
+zope.pagetemplate,svn://svn.zope.org/repos/main/zope.pagetemplate
+zope.password,svn://svn.zope.org/repos/main/zope.password
+zope.pluggableauth,svn://svn.zope.org/repos/main/zope.pluggableauth
+zope.principalannotation,svn://svn.zope.org/repos/main/zope.principalannotation
+zope.principalregistry,svn://svn.zope.org/repos/main/zope.principalregistry
+zope.processlifetime,svn://svn.zope.org/repos/main/zope.processlifetime
+zope.proxy,svn://svn.zope.org/repos/main/zope.proxy
+zope.ptresource,svn://svn.zope.org/repos/main/zope.ptresource
+zope.publisher,svn://svn.zope.org/repos/main/zope.publisher
+zope.ramcache,svn://svn.zope.org/repos/main/zope.ramcache
+zope.schema,svn://svn.zope.org/repos/main/zope.schema
+zope.security,svn://svn.zope.org/repos/main/zope.security
+zope.securitypolicy,svn://svn.zope.org/repos/main/zope.securitypolicy
+zope.sendmail,svn://svn.zope.org/repos/main/zope.sendmail
+zope.sequencesort,svn://svn.zope.org/repos/main/zope.sequencesort
+zope.server,svn://svn.zope.org/repos/main/zope.server
+zope.session,svn://svn.zope.org/repos/main/zope.session
+zope.site,svn://svn.zope.org/repos/main/zope.site
+zope.size,svn://svn.zope.org/repos/main/zope.size
+zope.structuredtext,svn://svn.zope.org/repos/main/zope.structuredtext
+zope.tal,svn://svn.zope.org/repos/main/zope.tal
+zope.tales,svn://svn.zope.org/repos/main/zope.tales
+zope.testing,svn://svn.zope.org/repos/main/zope.testing
+zope.testrunner,svn://svn.zope.org/repos/main/zope.testrunner
+zope.traversing,svn://svn.zope.org/repos/main/zope.traversing
+zope.viewlet,svn://svn.zope.org/repos/main/zope.viewlet
+
 #zopeapp:
-zc.sourcefactory
-zope.app.applicationcontrol
-zope.app.appsetup
-zope.app.authentication
-zope.app.basicskin
-zope.app.broken
-zope.app.component
-zope.app.container
-zope.app.content
-zope.app.debug
-zope.app.dependable
-zope.app.error
-zope.app.exception
-zope.app.folder
-zope.app.form
-zope.app.generations
-zope.app.http
-zope.app.i18n
-zope.app.locales
-zope.app.localpermission
-zope.app.pagetemplate
-zope.app.principalannotation
-zope.app.publication
-zope.app.publisher
-zope.app.renderer
-zope.app.rotterdam
-zope.app.schema
-zope.app.security
-zope.app.testing
+zc.sourcefactory,svn://svn.zope.org/repos/main/zc.sourcefactory
+zope.app.applicationcontrol,svn://svn.zope.org/repos/main/zope.app.applicationcontrol
+zope.app.appsetup,svn://svn.zope.org/repos/main/zope.app.appsetup
+zope.app.authentication,svn://svn.zope.org/repos/main/zope.app.authentication
+zope.app.basicskin,svn://svn.zope.org/repos/main/zope.app.basicskin
+zope.app.broken,svn://svn.zope.org/repos/main/zope.app.broken
+zope.app.component,svn://svn.zope.org/repos/main/zope.app.component
+zope.app.container,svn://svn.zope.org/repos/main/zope.app.container
+zope.app.content,svn://svn.zope.org/repos/main/zope.app.content
+zope.app.debug,svn://svn.zope.org/repos/main/zope.app.debug
+zope.app.dependable,svn://svn.zope.org/repos/main/zope.app.dependable
+zope.app.error,svn://svn.zope.org/repos/main/zope.app.error
+zope.app.exception,svn://svn.zope.org/repos/main/zope.app.exception
+zope.app.folder,svn://svn.zope.org/repos/main/zope.app.folder
+zope.app.form,svn://svn.zope.org/repos/main/zope.app.form
+zope.app.generations,svn://svn.zope.org/repos/main/zope.app.generations
+zope.app.http,svn://svn.zope.org/repos/main/zope.app.http
+zope.app.i18n,svn://svn.zope.org/repos/main/zope.app.i18n
+zope.app.locales,svn://svn.zope.org/repos/main/zope.app.locales
+zope.app.localpermission,svn://svn.zope.org/repos/main/zope.app.localpermission
+zope.app.pagetemplate,svn://svn.zope.org/repos/main/zope.app.pagetemplate
+zope.app.principalannotation,svn://svn.zope.org/repos/main/zope.app.principalannotation
+zope.app.publication,svn://svn.zope.org/repos/main/zope.app.publication
+zope.app.publisher,svn://svn.zope.org/repos/main/zope.app.publisher
+zope.app.renderer,svn://svn.zope.org/repos/main/zope.app.renderer
+zope.app.rotterdam,svn://svn.zope.org/repos/main/zope.app.rotterdam
+zope.app.schema,svn://svn.zope.org/repos/main/zope.app.schema
+zope.app.security,svn://svn.zope.org/repos/main/zope.app.security
+zope.app.testing,svn://svn.zope.org/repos/main/zope.app.testing
 #zope.app.twisted tries IPV6
-zope.app.wsgi
-zope.app.zcmlfiles
-zope.app.zopeappgenerations
-zope.generations
-zope.testbrowser
+zope.app.wsgi,svn://svn.zope.org/repos/main/zope.app.wsgi
+zope.app.zcmlfiles,svn://svn.zope.org/repos/main/zope.app.zcmlfiles
+zope.app.zopeappgenerations,svn://svn.zope.org/repos/main/zope.app.zopeappgenerations
+zope.generations,svn://svn.zope.org/repos/main/zope.generations
+zope.testbrowser,svn://svn.zope.org/repos/main/zope.testbrowser
+
 #my wild choices:
-persistent
-transaction
-BTrees
-z3c.authenticator
-z3c.baseregistry
-z3c.batching
-z3c.breadcrumb
-z3c.configurator
-z3c.contents
-z3c.coverage
-z3c.datagenerator
-z3c.form
-z3c.formui
-z3c.json
-z3c.jsonrpc
-z3c.jsonrpcproxy
-z3c.jsontree
-z3c.language.negotiator
-z3c.language.session
-z3c.language.switch
-z3c.layer.pagelet
-z3c.layer.ready2go
-z3c.macro
-z3c.menu.ready2go
-z3c.pagelet
-z3c.password
-z3c.pdftemplate
-z3c.ptcompat
-z3c.recipe.paster
+persistent,git://github.com/zopefoundation/persistent.git
+transaction,git://github.com/zopefoundation/transaction.git
+BTrees,git://github.com/zopefoundation/BTrees.git
+z3c.authenticator,svn://svn.zope.org/repos/main/z3c.authenticator
+z3c.baseregistry,svn://svn.zope.org/repos/main/z3c.baseregistry
+z3c.batching,svn://svn.zope.org/repos/main/z3c.batching
+z3c.breadcrumb,svn://svn.zope.org/repos/main/z3c.breadcrumb
+z3c.configurator,svn://svn.zope.org/repos/main/z3c.configurator
+z3c.contents,svn://svn.zope.org/repos/main/z3c.contents
+z3c.coverage,svn://svn.zope.org/repos/main/z3c.coverage
+z3c.datagenerator,svn://svn.zope.org/repos/main/z3c.datagenerator
+z3c.form,svn://svn.zope.org/repos/main/z3c.form
+z3c.formui,svn://svn.zope.org/repos/main/z3c.formui
+z3c.json,svn://svn.zope.org/repos/main/z3c.json
+z3c.jsonrpc,svn://svn.zope.org/repos/main/z3c.jsonrpc
+z3c.jsonrpcproxy,svn://svn.zope.org/repos/main/z3c.jsonrpcproxy
+z3c.jsontree,svn://svn.zope.org/repos/main/z3c.jsontree
+z3c.language.negotiator,svn://svn.zope.org/repos/main/z3c.language.negotiator
+z3c.language.session,svn://svn.zope.org/repos/main/z3c.language.session
+z3c.language.switch,svn://svn.zope.org/repos/main/z3c.language.switch
+z3c.layer.pagelet,svn://svn.zope.org/repos/main/z3c.layer.pagelet
+z3c.layer.ready2go,svn://svn.zope.org/repos/main/z3c.layer.ready2go
+z3c.macro,svn://svn.zope.org/repos/main/z3c.macro
+z3c.menu.ready2go,svn://svn.zope.org/repos/main/z3c.menu.ready2go
+z3c.pagelet,svn://svn.zope.org/repos/main/z3c.pagelet
+z3c.password,svn://svn.zope.org/repos/main/z3c.password
+z3c.pdftemplate,svn://svn.zope.org/repos/main/z3c.pdftemplate
+z3c.ptcompat,svn://svn.zope.org/repos/main/z3c.ptcompat
+z3c.recipe.paster,svn://svn.zope.org/repos/main/z3c.recipe.paster
 #z3c.rml tries ghostscipt via PIL
-z3c.sampledata
-z3c.table
-z3c.tabular
-z3c.template
-z3c.testing
-z3c.viewtemplate
-z3c.xmlhttp
-z3c.zrtresource
-zc.catalog
-zc.configuration
-zc.i18n
-zc.lockfile
-zc.monitor
-zc.ngi
-zc.queue
-zc.resourcelibrary
-zc.table
+z3c.sampledata,svn://svn.zope.org/repos/main/z3c.sampledata
+z3c.table,svn://svn.zope.org/repos/main/z3c.table
+z3c.tabular,svn://svn.zope.org/repos/main/z3c.tabular
+z3c.template,svn://svn.zope.org/repos/main/z3c.template
+z3c.testing,svn://svn.zope.org/repos/main/z3c.testing
+z3c.viewtemplate,svn://svn.zope.org/repos/main/z3c.viewtemplate
+z3c.xmlhttp,svn://svn.zope.org/repos/main/z3c.xmlhttp
+z3c.zrtresource,svn://svn.zope.org/repos/main/z3c.zrtresource
+zc.catalog,svn://svn.zope.org/repos/main/zc.catalog
+zc.configuration,svn://svn.zope.org/repos/main/zc.configuration
+zc.i18n,svn://svn.zope.org/repos/main/zc.i18n
+zc.lockfile,svn://svn.zope.org/repos/main/zc.lockfile
+zc.monitor,svn://svn.zope.org/repos/main/zc.monitor
+zc.ngi,svn://svn.zope.org/repos/main/zc.ngi
+zc.queue,svn://svn.zope.org/repos/main/zc.queue
+zc.resourcelibrary,svn://svn.zope.org/repos/main/zc.resourcelibrary
+zc.table,svn://svn.zope.org/repos/main/zc.table
 
-zope.app.interface
-zope.app.server
-zope.app.session
\ No newline at end of file
+zope.app.interface,svn://svn.zope.org/repos/main/zope.app.interface
+zope.app.server,svn://svn.zope.org/repos/main/zope.app.server
+zope.app.session,svn://svn.zope.org/repos/main/zope.app.session
\ No newline at end of file



More information about the checkins mailing list