<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/660b8b65a7b098fc545f12782992188af32a2a16">https://github.com/macports/macports-infrastructure/commit/660b8b65a7b098fc545f12782992188af32a2a16</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 660b8b65a7b098fc545f12782992188af32a2a16
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Mon Mar 12 20:46:30 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> Update jobs step descriptions
</span>---
buildbot/master.cfg | 44 ++++++++++++++++++++++----------------------
1 file changed, 22 insertions(+), 22 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 0be4c7a..b6c90df 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;'>@@ -602,8 +602,8 @@ class RsyncDeployStep(steps.ShellCommand):
</span> def __init__(self, host, user, srcpath, destpath, **kwargs):
super(RsyncDeployStep, self).__init__(
name='rsync',
<span style='display:block; white-space:pre;background:#ffe0e0;'>- description='deploying',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- descriptionDone='deployed',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description=['deploying'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ descriptionDone=['deploy'],
</span> command='rsync -avzhC --delay-updates --delete-delay %s %s@%s:%s/' % (srcpath, user, host, destpath),
env={'RSYNC_RSH': 'ssh -i ssh_key -oUserKnownHostsFile=ssh_known_hosts'},
**kwargs)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -613,8 +613,8 @@ class PostgresDeployStep(steps.ShellCommand):
</span> def __init__(self, host, user, sqlfile, **kwargs):
super(PostgresDeployStep, self).__init__(
name='psql',
<span style='display:block; white-space:pre;background:#ffe0e0;'>- description='deploying',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- descriptionDone='deployed',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description=['deploying'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ descriptionDone=['deploy'],
</span> command='ssh -C -i ssh_key -oUserKnownHostsFile=ssh_known_hosts %s@%s psql < %s' % (user, host, sqlfile),
**kwargs)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -623,15 +623,15 @@ def make_ssh_deploy_step(sshkeyfile, sshknownhostsfile, step):
</span> return (
steps.FileDownload(
name='ssh key',
<span style='display:block; white-space:pre;background:#ffe0e0;'>- description='transferring',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- descriptionDone='transfer',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description=['transferring'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ descriptionDone=['transfer'],
</span> mastersrc=sshkeyfile,
slavedest='ssh_key',
mode=0600),
steps.FileDownload(
name='ssh known_hosts',
<span style='display:block; white-space:pre;background:#ffe0e0;'>- description='transferring',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- descriptionDone='transfer',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description=['transferring'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ descriptionDone=['transfer'],
</span> mastersrc=sshknownhostsfile,
slavedest='ssh_known_hosts',
mode=0600),
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -644,8 +644,8 @@ class CDNPurgeStep(steps.MasterShellCommand):
</span> def __init__(self, zoneid, **kwargs):
super(CDNPurgeStep, self).__init__(
name='cdn',
<span style='display:block; white-space:pre;background:#ffe0e0;'>- description='purging',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- descriptionDone='purged',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description=['purging', 'CDN zone'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ descriptionDone=['purge', 'CDN zone'],
</span> command="./maxcdn-purge/maxcdn-purge.py %s %s" % (zoneid, config['deploy']['maxcdn']['secrets']),
env={'PATH': "${PATH}"},
**kwargs)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -663,8 +663,8 @@ if 'www' in config['deploy']:
</span> haltOnFailure=True))
jobs_www_factory.addStep(steps.Compile(
name='lint',
<span style='display:block; white-space:pre;background:#ffe0e0;'>- description='linting',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- descriptionDone='lint',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description=['linting'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ descriptionDone=['lint'],
</span> command='make lint',
workdir='build/www'))
jobs_www_factory.addSteps(
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -702,15 +702,15 @@ if 'portindex' in config['deploy']:
</span> jobs_portindex_factory.addStep(steps.ShellCommand(
command='portindex',
name='portindex',
<span style='display:block; white-space:pre;background:#ffe0e0;'>- description=['generating'],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- descriptionDone=['done'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description=['indexing', 'ports'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ descriptionDone=['index', 'ports'],
</span> workdir='build/ports',
haltOnFailure=True))
jobs_portindex_factory.addStep(steps.ShellCommand(
command='port-tclsh infrastructure/jobs/portindex2postgres.tcl',
name='portindex2postgres',
<span style='display:block; white-space:pre;background:#ffe0e0;'>- description=['generating'],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- descriptionDone=['done'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description=['converting', 'index to SQL'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ descriptionDone=['convert', 'index to SQL'],
</span> haltOnFailure=True))
jobs_portindex_factory.addSteps(
make_ssh_deploy_step(
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -777,8 +777,8 @@ if 'guide' in config['deploy']:
</span> # TODO: check for existence of tools in toolsprefix
jobs_guide_factory.addStep(steps.Compile(
name='validate',
<span style='display:block; white-space:pre;background:#ffe0e0;'>- description='validating',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- descriptionDone='validate',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description=['validating'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ descriptionDone=['validate'],
</span> command='make validate',
workdir='build/guide',
env={'PATH': path_jobs},
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -816,16 +816,16 @@ if 'man' in config['deploy']:
</span> jobs_man_factory.addStep(steps.Compile(
command='make -C vendor/tcl/unix tclsh',
name='make tclsh',
<span style='display:block; white-space:pre;background:#ffe0e0;'>- description=['compile tclsh'],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- descriptionDone=['compile tclsh'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description=['compiling', 'tclsh'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ descriptionDone=['compile', 'tclsh'],
</span> warnOnWarnings=False,
haltOnFailure=True))
# TODO: check for existence of tools in toolsprefix
jobs_man_factory.addStep(steps.ShellCommand(
command='make -C doc html prefix=' + config['jobstoolsprefix'],
name='make',
<span style='display:block; white-space:pre;background:#ffe0e0;'>- description=['generate man pages'],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- descriptionDone=['generated man pages'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description=['making', 'man pages'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ descriptionDone=['make', 'man pages'],
</span> env={'PATH': path_jobs},
haltOnFailure=True))
jobs_man_factory.addSteps(
</pre><pre style='margin:0'>
</pre>