<pre style='margin:0'>
Rainer Müller (raimue) pushed a commit to branch master
in repository macports-infrastructure.
</pre>
<p><a href="https://github.com/macports/macports-infrastructure/commit/66784541ff7b982d1209f1ebff4a08d7d37723b3">https://github.com/macports/macports-infrastructure/commit/66784541ff7b982d1209f1ebff4a08d7d37723b3</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 66784541ff7b982d1209f1ebff4a08d7d37723b3
</span>Author: Rainer Müller <raimue@macports.org>
AuthorDate: Tue Jul 11 18:03:25 2017 +0200
<span style='display:block; white-space:pre;color:#404040;'> buildbot: Set haltOnFailure=True on required steps
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Continuing without completing steps (such as a git checkout) is not
</span><span style='display:block; white-space:pre;color:#404040;'> useful or could lead to wrong results.
</span>---
buildbot/master.cfg | 33 ++++++++++++++++++++++-----------
1 file changed, 22 insertions(+), 11 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 12b73b8..c359323 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;'>@@ -596,7 +596,8 @@ if 'www' in config['deploy']:
</span> progress=True,
mode='full',
method='copy',
<span style='display:block; white-space:pre;background:#ffe0e0;'>- workdir='build/www'))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ workdir='build/www',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ haltOnFailure=True))
</span> jobs_www_factory.addStep(steps.Compile(
name='lint',
description='linting',
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -623,25 +624,29 @@ if 'portindex' in config['deploy']:
</span> alwaysUseLatest=True,
mode='full',
method='copy',
<span style='display:block; white-space:pre;background:#ffe0e0;'>- workdir='build/infrastructure'))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ workdir='build/infrastructure',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ haltOnFailure=True))
</span> jobs_portindex_factory.addStep(steps.Git(
name='git ports',
repourl=config['portsurl'],
progress=True,
alwaysUseLatest=True,
mode='incremental',
<span style='display:block; white-space:pre;background:#ffe0e0;'>- workdir='build/ports'))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ workdir='build/ports',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ haltOnFailure=True))
</span> jobs_portindex_factory.addStep(steps.ShellCommand(
command='portindex',
name='portindex',
description=['generating'],
descriptionDone=['done'],
<span style='display:block; white-space:pre;background:#ffe0e0;'>- workdir='build/ports'))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ workdir='build/ports',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ haltOnFailure=True))
</span> jobs_portindex_factory.addStep(steps.ShellCommand(
command='port-tclsh infrastructure/jobs/portindex2postgres.tcl',
name='portindex2postgres',
description=['generating'],
<span style='display:block; white-space:pre;background:#ffe0e0;'>- descriptionDone=['done']))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ descriptionDone=['done'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ haltOnFailure=True))
</span> jobs_portindex_factory.addSteps(
make_ssh_deploy_step(
sshkeyfile=config['deploy']['portindex']['sshkeyfile'],
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -667,17 +672,20 @@ if 'guide' in config['deploy']:
</span> progress=True,
mode='full',
method='copy',
<span style='display:block; white-space:pre;background:#ffe0e0;'>- workdir='build/guide'))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ workdir='build/guide',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ haltOnFailure=True))
</span> # TODO: check for existence of tools in toolsprefix
jobs_guide_factory.addStep(steps.Compile(
name='validate',
description='validating',
descriptionDone='validate',
command='make validate',
<span style='display:block; white-space:pre;background:#ffe0e0;'>- workdir='build/guide'))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ workdir='build/guide',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ haltOnFailure=True))
</span> jobs_guide_factory.addStep(steps.Compile(
command='make all',
<span style='display:block; white-space:pre;background:#ffe0e0;'>- workdir='build/guide'))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ workdir='build/guide',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ haltOnFailure=True))
</span> jobs_guide_factory.addSteps(
make_ssh_deploy_step(
sshkeyfile=config['deploy']['guide']['sshkeyfile'],
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -695,17 +703,20 @@ if 'man' in config['deploy']:
</span> repourl=config['baseurl'],
progress=True,
mode='full',
<span style='display:block; white-space:pre;background:#ffe0e0;'>- method='copy'))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ method='copy',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ haltOnFailure=True))
</span> jobs_man_factory.addStep(steps.Configure(
command="./standard_configure.sh",
<span style='display:block; white-space:pre;background:#ffe0e0;'>- logfiles={'config.log': 'config.log'}))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ logfiles={'config.log': 'config.log'},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ haltOnFailure=True))
</span> # TODO: check for existence of tools in toolsprefix
jobs_man_factory.addStep(steps.ShellCommand(
command='make -C doc html',
name='make',
description=['generate man pages'],
descriptionDone=['generated man pages'],
<span style='display:block; white-space:pre;background:#ffe0e0;'>- env={'PATH': path_jobs}))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ env={'PATH': path_jobs},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ haltOnFailure=True))
</span> jobs_man_factory.addSteps(
make_ssh_deploy_step(
sshkeyfile=config['deploy']['man']['sshkeyfile'],
</pre><pre style='margin:0'>
</pre>