<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/7a2fc5596970826f362413b362a5a3dc23db5e7a">https://github.com/macports/macports-infrastructure/commit/7a2fc5596970826f362413b362a5a3dc23db5e7a</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 7a2fc55 Use mpbb to mirror distfiles
</span>7a2fc55 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7a2fc5596970826f362413b362a5a3dc23db5e7a
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed Mar 7 09:03:01 2018 -0600
<span style='display:block; white-space:pre;color:#404040;'> Use mpbb to mirror distfiles
</span>---
buildbot/config.json.sample | 3 +++
buildbot/master.cfg | 32 +++++++++++++++++++++++++++++---
2 files changed, 32 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/buildbot/config.json.sample b/buildbot/config.json.sample
</span><span style='display:block; white-space:pre;color:#808080;'>index d500efb..55d9508 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/buildbot/config.json.sample
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/buildbot/config.json.sample
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,6 +36,9 @@
</span> "sshkeyfile": "",
"sshknownhostsfile": "ssh_known_hosts",
"destpath": ""
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "mirror": {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "distfilesdir": "",
</span> }
}
}
<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 8c9e9bb..a05fa07 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;'>@@ -678,11 +678,37 @@ 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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # get mpbb; we'll do the checkout of base and dports via these scripts
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ jobs_mirror_factory.addStep(GitForTools(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ repourl=config['mpbburl'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ progress=True,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ env={'PATH': path_ports},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ alwaysUseLatest=True,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ workdir=os.path.join(jobs_mirror_factory.workdir, 'mpbb'),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ haltOnFailure=True))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ jobs_mirror_factory.addStep(steps.ShellCommand(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ command=['./mpbb/mpbb', '--prefix', util.WithProperties(prefix), 'selfupdate'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ name='selfupdate',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description=['updating', 'MacPorts'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ descriptionDone=['update', 'MacPorts'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ haltOnFailure=True))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ jobs_mirror_factory.addStep(steps.ShellCommand(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ command=['./mpbb/mpbb', '--prefix', util.WithProperties(prefix), 'checkout',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ '--ports-url', config['portsurl']],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ timeout=3600,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ name='checkout',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description=['syncing', 'ports'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ descriptionDone=['sync', 'ports'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ haltOnFailure=True))
</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=util.WithProperties('port mirror %(portname)s'),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ command=['./mpbb/mpbb', '--prefix', util.WithProperties(prefix), 'mirror-distfiles', '--distfiles-dir', config['mirror']['distfilesdir'], util.WithProperties('%(portname)s')],
</span> name='mirror',
<span style='display:block; white-space:pre;background:#ffe0e0;'>- description=['mirroring'],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- descriptionDone=['done']))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description=['mirroring', 'distfiles'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ descriptionDone=['mirror', 'distfiles']))
</span>
if 'guide' in config['deploy']:
jobs_guide_factory = util.BuildFactory()
</pre><pre style='margin:0'>
</pre>