Changeset 81184

Timestamp:

07/26/11 17:36:16 (4 years ago)

Author:

wsiegrist@…

Message:

Support for changes being sent from svn server plus move buildbot behind the proxy

File:

• contrib/buildbot/master.cfg (modified) (8 diffs)

contrib/buildbot/master.cfg

@@ -68 +68 @@
     from buildbot.changes.svnpoller import SVNPoller
     c['change_source'] = [SVNPoller(
-            'https://svn.macports.org/repository/macports/trunk/base',
-            project='base',
+            'https://svn.macports.org/repository/macports/trunk',
             svnbin='/opt/local/bin/svn',
             pollinterval=300),
-        SVNPoller(
-            'https://svn.macports.org/repository/macports/trunk/dports',
-            project='ports',
-            svnbin='/opt/local/bin/svn',
-            pollinterval=300)
         ]
 
@@ -82 +76 @@
 
 # consider changes to _resources as unimportant
-def ports_check_importance(change):
+def change_has_ports(change):
     for f in change.files:
-        if f.split('/')[0] != "_resources":
+        if "_resources" in f:
+            continue
+        if "dports" in f and "Portfile" in f:
             return True
     return False
 
+def change_has_base(change):
+    for f in change.files:
+        if f.startswith('base'):
+            return True
+    return False
+        
+
 # Configure the Schedulers, which decide how to react to incoming changes.
-
+from buildbot.schedulers.basic import SingleBranchScheduler
 from buildbot.changes.filter import ChangeFilter
-base_filter = ChangeFilter(project="base")
-ports_filter = ChangeFilter(project="ports")
-
-from buildbot.schedulers.basic import SingleBranchScheduler
+repofilter = ChangeFilter(repository="/svn/repositories/macports")
 c['schedulers'] = [SingleBranchScheduler(
                             name="base",
-                            treeStableTimer=300,
-                            change_filter=base_filter,
+                            treeStableTimer=10,
+                            fileIsImportant=change_has_base,
+                            change_filter = repofilter,
                             builderNames=["buildbase"]),
                    SingleBranchScheduler(
                             name="ports",
-                            treeStableTimer=30,
-                            change_filter=ports_filter,
-                            fileIsImportant=ports_check_importance,
+                            treeStableTimer=10,
+                            fileIsImportant=change_has_ports,
+                            change_filter = repofilter,
                             builderNames=["buildports"])
                 ]
@@ -142 +143 @@
 
             portset = set()
-            # paths should be category/portdir(/...)
+            # paths should be dports/category/portdir(/...)
             for f in self.build.allFiles():
                 comps = f.split('/')
-                if len(comps) >= 2 and comps[0] != '_resources':
+                if len(comps) >= 3 and comps[0] == 'dports':
                     portset.add(comps[1])
             portlist += ' ' + ' '.join(portset)
@@ -158 +159 @@
     dlhost=''
     dlpath='/www/hosts/packages.macports.org'
+    ulpath='archive_staging'
 else:
     prefix='%(workdir)s/opt/local'
@@ -163 +165 @@
     dlhost=''
     dlpath='./deployed_archives'
+    ulpath='archive_staging'
+
 
 ports_factory = BuildFactory()
@@ -180 +184 @@
                            'SRC_PREFIX': WithProperties(src_prefix)}))
 
-ulpath='archive_staging'
 ports_factory.addStep(ShellCommand(command=["./gather_archives.sh"],
                                    name="gather archives",
                                    description="gather distributable archives",
                       env={'PREFIX': WithProperties(prefix),
+                           'HOME': '/tmp/',
                            'ULPATH': ulpath}))
 # upload archives from build slave to master
@@ -203 +207 @@
                                    name="status",
                                    description="status",
-                        env={'PREFIX': WithProperties(prefix)},
+                        env={'PREFIX': WithProperties(prefix),
+                             'HOME': '/tmp/',
+                             },
                         logfiles={"portstatus": "portstatus.log"}))
 # TODO: do we want to upload the individual logs so maintainers can review them?
@@ -263 +269 @@
 if production:
     c['buildbotURL'] = "http://build.macports.org/"
-    c['status'].append(html.WebStatus(http_port=80, authz=authz_cfg))
+    c['status'].append(html.WebStatus(http_port=8710, authz=authz_cfg))
 else:
     c['buildbotURL'] = "http://localhost:8010/"