<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
<html lang="en">
<head>
<meta content="text/html; charset=US-ASCII" http-equiv="Content-Type">
<title>
GitLab
</title>
<style>img {
max-width: 100%; height: auto;
}
</style>
</head>
<body>
<div class="content">
<h3>
Vagrant Cascadian pushed to branch master
at <a href="https://salsa.debian.org/qa/jenkins.debian.net">Debian QA / jenkins.debian.net</a>
</h3>
<h4>
Commits:
</h4>
<ul>
<li>
<strong><a href="https://salsa.debian.org/qa/jenkins.debian.net/-/commit/b269be014c622ba6c09c7fc011303173858242f4">b269be01</a></strong>
<div>
<span>by Vagrant Cascadian</span>
<i>at 2022-02-05T17:39:25-08:00</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">reproducible debian: Hard-code the diffoscope timeout rather than
calculating it.
Sometimes diffoscope is getting pass an empty argument to --timeout:
diffoscope: error: unrecognized arguments: --timeout /srv/reproducible-results/rbuild-debian/tmp.2dVDO4MyJG/b2/python-circuitbreaker_1.3.2-2_amd64.changes
</pre>
</li>
</ul>
<h4>1 changed file:</h4>
<ul>
<li class="file-stats">
<a href="#e3529fc8c5367270028ddcf3d4783f057cb9019d">
bin/reproducible_build.sh
</a>
</li>
</ul>
<h4>Changes:</h4>
<li id="e3529fc8c5367270028ddcf3d4783f057cb9019d">
<a href="https://salsa.debian.org/qa/jenkins.debian.net/-/commit/b269be014c622ba6c09c7fc011303173858242f4#e3529fc8c5367270028ddcf3d4783f057cb9019d"><strong>bin/reproducible_build.sh</strong></a>
<hr>
<table class="code white" style="font-family: monospace; font-size: 90%;" bgcolor="#fff" width="100%" cellpadding="0" cellspacing="0">
<tr class="line_holder match" id="" style="line-height: 1.6;">
<td class="diff-line-num unfold js-unfold old_line" data-linenumber="368" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">...</td>
<td class="diff-line-num unfold js-unfold new_line" data-linenumber="368" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">...</td>
<td class="line_content match " style="padding-left: 0.5em; padding-right: 0.5em; color: rgba(0,0,0,0.3);" bgcolor="#fafafa">@@ -368,13 +368,13 @@ call_diffoscope_on_changes_files() {</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="368" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
368
</td>
<td class="new_line diff-line-num" data-linenumber="368" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
368
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC368" class="line" lang="shell"> log_info <span class="s2" style="color: #d14;">"</span><span class="nv" style="color: #008080;">$DIFFOSCOPE</span><span class="s2" style="color: #d14;"> will be used to compare the two builds:"</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="369" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
369
</td>
<td class="new_line diff-line-num" data-linenumber="369" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
369
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC369" class="line" lang="shell"> <span class="nb" style="color: #0086b3;">set</span> <span class="nt" style="color: #000080;">-x</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="370" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
370
</td>
<td class="new_line diff-line-num" data-linenumber="370" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
370
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC370" class="line" lang="shell"> <span class="nb" style="color: #0086b3;">set</span> +e</span>
</pre>
</td>
</tr>
<tr class="line_holder old" id="" style="line-height: 1.6;">
<td class="old_line diff-line-num old" data-linenumber="371" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc">
371
</td>
<td class="new_line diff-line-num old" data-linenumber="371" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content old" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#fbe9eb">
<pre style="margin: 0;">-<span id="LC371" class="line" lang="shell"> <span class="c" style="color: #998; font-style: italic;"># the --timeout <span class="idiff left right">90m</span> below is arbitrary and can be subject to further evaluation later</span></span>
</pre>
</td>
</tr>
<tr class="line_holder new" id="" style="line-height: 1.6;">
<td class="old_line diff-line-num new" data-linenumber="372" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6">
</td>
<td class="new_line diff-line-num new" data-linenumber="371" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6">
371
</td>
<td class="line_content new" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0">
<pre style="margin: 0;">+<span id="LC371" class="line" lang="shell"> <span class="c" style="color: #998; font-style: italic;"># the --timeout <span class="idiff left right">5400 (e.g. 90 minutes)</span> below is arbitrary and can be subject to further evaluation later</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="372" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
372
</td>
<td class="new_line diff-line-num" data-linenumber="372" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
372
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC372" class="line" lang="shell"> <span class="o" style="font-weight: 600;">(</span> <span class="nb" style="color: #0086b3;">timeout </span>125m <span class="nb" style="color: #0086b3;">nice </span>schroot <span class="se" style="color: #d14;">\</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="373" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
373
</td>
<td class="new_line diff-line-num" data-linenumber="373" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
373
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC373" class="line" lang="shell"> <span class="nt" style="color: #000080;">--directory</span> <span class="nv" style="color: #008080;">$TMPDIR</span> <span class="se" style="color: #d14;">\</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="374" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
374
</td>
<td class="new_line diff-line-num" data-linenumber="374" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
374
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC374" class="line" lang="shell"> <span class="nt" style="color: #000080;">--run-session</span> <span class="se" style="color: #d14;">\</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="375" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
375
</td>
<td class="new_line diff-line-num" data-linenumber="375" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
375
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC375" class="line" lang="shell"> <span class="nt" style="color: #000080;">-c</span> <span class="s2" style="color: #d14;">"</span><span class="nv" style="color: #008080;">$session</span><span class="s2" style="color: #d14;">"</span> <span class="se" style="color: #d14;">\</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="376" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
376
</td>
<td class="new_line diff-line-num" data-linenumber="376" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
376
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC376" class="line" lang="shell"> <span class="nt" style="color: #000080;">--</span> sh <span class="nt" style="color: #000080;">-c</span> <span class="s2" style="color: #d14;">"export TMPDIR=</span><span class="nv" style="color: #008080;">$TEMP</span><span class="s2" style="color: #d14;"> ; timeout </span><span class="nv" style="color: #008080;">$TIMEOUT</span><span class="s2" style="color: #d14;"> diffoscope </span><span class="se" style="color: #d14;">\</span></span>
</pre>
</td>
</tr>
<tr class="line_holder old" id="" style="line-height: 1.6;">
<td class="old_line diff-line-num old" data-linenumber="377" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc">
377
</td>
<td class="new_line diff-line-num old" data-linenumber="377" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content old" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#fbe9eb">
<pre style="margin: 0;">-<span id="LC377" class="line" lang="shell"><span class="s2" style="color: #d14;"> --timeout </span><span class="k" style="font-weight: 600;"><span class="idiff left">$((</span></span><span class="idiff"> </span><span class="m" style="color: #099;"><span class="idiff">90</span></span><span class="idiff"> </span><span class="o" style="font-weight: 600;"><span class="idiff">*</span></span><span class="idiff"> </span><span class="m" style="color: #099;"><span class="idiff">60</span></span><span class="idiff"> </span><span class="k" style="font-weight: 600;"><span class="idiff right">))</span></span><span class="s2" style="color: #d14;"> </span><span class="se" style="color: #d14;">\</span></span>
</pre>
</td>
</tr>
<tr class="line_holder new" id="" style="line-height: 1.6;">
<td class="old_line diff-line-num new" data-linenumber="378" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6">
</td>
<td class="new_line diff-line-num new" data-linenumber="377" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6">
377
</td>
<td class="line_content new" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0">
<pre style="margin: 0;">+<span id="LC377" class="line" lang="shell"><span class="s2" style="color: #d14;"> --timeout <span class="idiff left right">5400</span> </span><span class="se" style="color: #d14;">\</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="378" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
378
</td>
<td class="new_line diff-line-num" data-linenumber="378" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
378
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC378" class="line" lang="shell"><span class="s2" style="color: #d14;"> --html </span><span class="nv" style="color: #008080;">$TMPDIR</span><span class="s2" style="color: #d14;">/</span><span class="k" style="font-weight: 600;">${</span><span class="nv" style="color: #008080;">DBDREPORT</span><span class="k" style="font-weight: 600;">}</span><span class="s2" style="color: #d14;"> </span><span class="se" style="color: #d14;">\</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="379" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
379
</td>
<td class="new_line diff-line-num" data-linenumber="379" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
379
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC379" class="line" lang="shell"><span class="s2" style="color: #d14;"> --text </span><span class="nv" style="color: #008080;">$TMPDIR</span><span class="s2" style="color: #d14;">/</span><span class="nv" style="color: #008080;">$DBDTXT</span><span class="s2" style="color: #d14;"> </span><span class="se" style="color: #d14;">\</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="380" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
380
</td>
<td class="new_line diff-line-num" data-linenumber="380" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
380
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC380" class="line" lang="shell"><span class="s2" style="color: #d14;"> --json </span><span class="nv" style="color: #008080;">$TMPDIR</span><span class="s2" style="color: #d14;">/</span><span class="nv" style="color: #008080;">$DBDJSON</span><span class="s2" style="color: #d14;"> </span><span class="se" style="color: #d14;">\</span></span>
</pre>
</td>
</tr>
</table>
<br>
</li>
</div>
<div class="footer" style="margin-top: 10px;">
<p style="font-size: small; color: #666;">
—
<br>
<a href="https://salsa.debian.org/qa/jenkins.debian.net/-/commit/b269be014c622ba6c09c7fc011303173858242f4">View it on GitLab</a>.
<br>
You're receiving this email because of your account on salsa.debian.org.
If you'd like to receive fewer emails, you can
adjust your notification settings.
<script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","action":{"@type":"ViewAction","name":"View Commit","url":"https://salsa.debian.org/qa/jenkins.debian.net/-/commit/b269be014c622ba6c09c7fc011303173858242f4"}}</script>
</p>
</div>
</body>
</html>