<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/38b25ceed71bf1753642740a97a2ab1f7f116fa6">https://github.com/macports/macports-infrastructure/commit/38b25ceed71bf1753642740a97a2ab1f7f116fa6</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 38b25ceed71bf1753642740a97a2ab1f7f116fa6
</span>Author: Ryan Schmidt <git@ryandesign.com>
AuthorDate: Tue Nov 27 17:00:47 2018 -0600
<span style='display:block; white-space:pre;color:#404040;'> Deploy nondistributable archives to private server
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/54800
</span>---
buildbot/master.cfg | 22 ++++++++++++++++++----
1 file changed, 18 insertions(+), 4 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 8712f94..3bf6e27 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;'>@@ -87,6 +87,7 @@ config = {
</span>
# Deployment
'archivesite': 'http://packages.macports.org',
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'archivesiteprivate': 'https://packages-private.macports.org',
</span> 'privkey': '',
'deploy': {},
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -443,11 +444,15 @@ class SetPropertyFromCommandWithPortlist(steps.SetPropertyFromCommand):
</span> if config['production']:
prefix = '/opt/local'
dlhost = 'packages@packages-origin.macports.org'
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ dlhost_private = dlhost
</span> dlpath = '/var/www/html/packages'
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ dlpath_private = '/var/www/html/packages-private'
</span> else:
prefix = config['slaveprefix']
dlhost = ''
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ dlhost_private = dlhost
</span> dlpath = './deployed_archives'
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ dlpath_private = './deployed_archives_private'
</span>
ulpath = 'archive_staging'
ulpath_unique = ulpath+'-%(buildername)s'
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -596,7 +601,10 @@ portbuilder_factory.addStep(steps.Compile(
</span> haltOnFailure=True))
portbuilder_factory.addStep(steps.ShellCommand(
<span style='display:block; white-space:pre;background:#ffe0e0;'>- command=['./mpbb/mpbb', '--prefix', util.WithProperties(prefix), 'gather-archives', '--archive-site', config['archivesite'], '--staging-dir', ulpath],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ command=['./mpbb/mpbb', '--prefix', util.WithProperties(prefix), 'gather-archives',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ '--archive-site', config['archivesite'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ '--archive-site-private', config['archivesiteprivate'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ '--staging-dir', ulpath],
</span> name='gather-archives',
description=['gathering', 'archives'],
descriptionDone=['gather', 'archives'],
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -611,11 +619,17 @@ portbuilder_factory.addStep(steps.DirectoryUpload(
</span> # sign generated binaries and sync to download server (if distributable)
if config['production']:
portbuilder_factory.addStep(steps.MasterShellCommand(
<span style='display:block; white-space:pre;background:#ffe0e0;'>- command=['./deploy_archives.sh', util.WithProperties(ulpath_unique)],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ command=['./deploy_archives.sh', util.WithProperties(os.path.join(ulpath_unique, 'public'))],
</span> name='deploy-archives',
<span style='display:block; white-space:pre;background:#ffe0e0;'>- description=['deploying', 'archives'],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- descriptionDone=['deploy', 'archives'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description=['deploying', 'public', 'archives'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ descriptionDone=['deploy', 'public', 'archives'],
</span> env={'PRIVKEY': config['privkey'], 'DLHOST': dlhost, 'DLPATH': dlpath}))
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ portbuilder_factory.addStep(steps.MasterShellCommand(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ command=['./deploy_archives.sh', util.WithProperties(os.path.join(ulpath_unique, 'private'))],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ name='deploy-archives-private',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description=['deploying', 'private', 'archives'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ descriptionDone=['deploy', 'private', 'archives'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ env={'PRIVKEY': config['privkey'], 'DLHOST': dlhost_private, 'DLPATH': dlpath_private}))
</span>
# TODO: do we want to upload the individual logs so maintainers can review them?
portbuilder_factory.addStep(steps.ShellCommand(
</pre><pre style='margin:0'>
</pre>