Re: [macports-infrastructure] branch master updated: Use mpbb to mirror distfiles

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

Re: [macports-infrastructure] branch master updated: Use mpbb to mirror distfiles

Rainer Müller-4
On 2018-03-07 16:03, Ryan Schmidt wrote:
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-infrastructure.

https://github.com/macports/macports-infrastructure/commit/7a2fc5596970826f362413b362a5a3dc23db5e7a

The following commit(s) were added to refs/heads/master by this push:
     new 7a2fc55  Use mpbb to mirror distfiles
7a2fc55 is described below

commit 7a2fc5596970826f362413b362a5a3dc23db5e7a
Author: Ryan Schmidt [hidden email]
AuthorDate: Wed Mar 7 09:03:01 2018 -0600

    Use mpbb to mirror distfiles
---
 buildbot/config.json.sample |  3 +++
 buildbot/master.cfg         | 32 +++++++++++++++++++++++++++++---
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/buildbot/config.json.sample b/buildbot/config.json.sample
index d500efb..55d9508 100644
--- a/buildbot/config.json.sample
+++ b/buildbot/config.json.sample
@@ -36,6 +36,9 @@
             "sshkeyfile": "",
             "sshknownhostsfile": "ssh_known_hosts",
             "destpath": ""
+        },
+        "mirror": {
+            "distfilesdir": "",
         }
     }
 }
diff --git a/buildbot/master.cfg b/buildbot/master.cfg
index 8c9e9bb..a05fa07 100644
--- a/buildbot/master.cfg
+++ b/buildbot/master.cfg
@@ -678,11 +678,37 @@ if 'portindex' in config['deploy']:
 
 if 'mirror' in config['deploy']:
     jobs_mirror_factory = util.BuildFactory()
+
+    # get mpbb; we'll do the checkout of base and dports via these scripts
+    jobs_mirror_factory.addStep(GitForTools(
+        repourl=config['mpbburl'],
+        progress=True,
+        env={'PATH': path_ports},
This should probably use path_jobs here. These are identical paths at the moment, but I think it is better to keep the abstraction.

Rainer
Reply | Threaded
Open this post in threaded view
|

Re: [macports-infrastructure] branch master updated: Use mpbb to mirror distfiles

Rainer Müller-4
On 2018-03-07 18:21, Rainer Müller wrote:
> This should probably use path_jobs here. These are identical paths at
> the moment, but I think it is better to keep the abstraction.

Nevermind, I was interrupted while typing the mail and you already fixed
it by now. Sorry for the noise.

Rainer
Reply | Threaded
Open this post in threaded view
|

Re: [macports-infrastructure] branch master updated: Use mpbb to mirror distfiles

Ryan Schmidt-24

On Mar 7, 2018, at 11:24, Rainer Müller wrote:

> On 2018-03-07 18:21, Rainer Müller wrote:
>> This should probably use path_jobs here. These are identical paths at
>> the moment, but I think it is better to keep the abstraction.
>
> Nevermind, I was interrupted while typing the mail and you already fixed
> it by now. Sorry for the noise.

But thanks for the review. I haven't been checking my email...