<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-infrastructure.
</pre>
<p><a href="https://github.com/macports/macports-infrastructure/commit/4d02d8cdda8126d41e0b7805aeb650161ef5b9f4">https://github.com/macports/macports-infrastructure/commit/4d02d8cdda8126d41e0b7805aeb650161ef5b9f4</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 4d02d8c Trigger just one mirroring job per portwatcher
</span>4d02d8c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4d02d8cdda8126d41e0b7805aeb650161ef5b9f4
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu Mar 8 09:04:08 2018 -0600
<span style='display:block; white-space:pre;color:#404040;'> Trigger just one mirroring job per portwatcher
</span>---
buildbot/master.cfg | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/buildbot/master.cfg b/buildbot/master.cfg
</span><span style='display:block; white-space:pre;color:#808080;'>index a782a06..006b056 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/buildbot/master.cfg
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/buildbot/master.cfg
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,6 +13,7 @@ import re
</span> import subprocess
from buildbot.plugins import buildslave, changes, schedulers, status, steps, util
<span style='display:block; white-space:pre;background:#e0ffe0;'>+from buildbot.process.properties import Property
</span> # In 0.8.12, WebStatus can't be used as a plugin because it doesn't
# actually implement the IStatusReceiver interface, as it claims to.
from buildbot.status.web.baseweb import WebStatus
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -476,9 +477,9 @@ def make_portwatcher_factory(triggerable):
</span> description=['listing', 'subports']))
if 'mirror' in config['deploy']:
<span style='display:block; white-space:pre;background:#ffe0e0;'>- portwatcher_factory.addStep(TriggerWithPortlist(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ portwatcher_factory.addStep(steps.Trigger(
</span> schedulerNames=['mirror'],
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set_properties={'triggered_by': make_build_url},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_properties={'subportlist': Property('subportlist'), 'triggered_by': make_build_url},
</span> waitForFinish=True,
updateSourceStamp=True))
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -679,6 +680,7 @@ if 'portindex' in config['deploy']:
</span>
if 'mirror' in config['deploy']:
jobs_mirror_factory = util.BuildFactory()
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This is the wrong absolute path! It's relative to the master; we want it relative to the worker.
</span> jobs_mirror_prefix = os.path.abspath(os.path.join(jobs_mirror_factory.workdir, 'prefix'))
# get mpbb; we'll do the checkout of base and dports via these scripts
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -706,8 +708,12 @@ if 'mirror' in config['deploy']:
</span> descriptionDone=['sync', 'ports'],
haltOnFailure=True))
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ @util.renderer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def make_jobs_mirror_command(props):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ['./mpbb/mpbb', '--prefix', jobs_mirror_prefix, 'mirror-distfiles', '--distfiles-dir', config['deploy']['mirror']['distfilesdir']] + props.getProperty('subportlist').split()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> jobs_mirror_factory.addStep(steps.ShellCommand(
<span style='display:block; white-space:pre;background:#ffe0e0;'>- command=['./mpbb/mpbb', '--prefix', jobs_mirror_prefix, 'mirror-distfiles', '--distfiles-dir', config['deploy']['mirror']['distfilesdir'], util.WithProperties('%(portname)s')],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ command=make_jobs_mirror_command,
</span> name='mirror',
description=['mirroring', 'distfiles'],
descriptionDone=['mirror', 'distfiles']))
</pre><pre style='margin:0'>
</pre>