<!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=utf-8" http-equiv="Content-Type">
<title>
GitLab
</title>
<style>img {
max-width: 100%; height: auto;
}
</style>
</head>
<body>
<div class="content">
<h3>
Holger Levsen 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/adf9104a07060b783de91e06cd597934d5761d35">adf9104a</a></strong>
<div>
<span>by Holger Levsen</span>
<i>at 2018-05-31T23:11:07+00:00</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">s#git://git.debian.org/pkg-privacy/packages/torbrowser-launcher.git#https://salsa.debian.org/pkg-privacy-team/torbrowser-launcher#
Signed-off-by: Holger Levsen <holger@layer-acht.org>
</pre>
</li>
</ul>
<h4>2 changed files:</h4>
<ul>
<li class="file-stats">
<a href="#3b9a8cb524a125b1ccbb04c44a49644969091e40">
bin/test_torbrowser-launcher.sh
</a>
</li>
<li class="file-stats">
<a href="#322b62fcca1bf5c65228491407d362901e7a82e7">
job-cfg/torbrowser-launcher.yaml
</a>
</li>
</ul>
<h4>Changes:</h4>
<li id="3b9a8cb524a125b1ccbb04c44a49644969091e40">
<a href="https://salsa.debian.org/qa/jenkins.debian.net/commit/adf9104a07060b783de91e06cd597934d5761d35#3b9a8cb524a125b1ccbb04c44a49644969091e40"><strong>bin/test_torbrowser-launcher.sh</strong></a>
<hr>
<table class="code white" style="font-family: monospace; font-size: 12px;" 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="431" 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="431" 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">@@ -431,7 +431,7 @@ download_and_launch() {</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="431" 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">
431
</td>
<td class="diff-line-num new_line" data-linenumber="431" 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">
431
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC431" class="line" lang="shell"><span class="o" style="font-weight: 600;">}</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="432" 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">
432
</td>
<td class="diff-line-num new_line" data-linenumber="432" 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">
432
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC432" class="line" lang="shell"></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="433" 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">
433
</td>
<td class="diff-line-num new_line" data-linenumber="433" 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">
433
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC433" class="line" lang="shell">merge_debian_branch<span class="o" style="font-weight: 600;">()</span> <span class="o" style="font-weight: 600;">{</span></span>
</pre>
</td>
</tr>
<tr class="line_holder old" id="" style="line-height: 1.6;">
<td class="diff-line-num old old_line" data-linenumber="434" 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">
434
</td>
<td class="diff-line-num new_line old" data-linenumber="434" 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 noteable_line old" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#fbe9eb">
<pre style="margin: 0;">-<span id="LC434" class="line" lang="shell"> <span class="nb" style="color: #0086b3;">local </span><span class="nv" style="color: teal;">DEBIAN_GIT_URL</span><span class="o" style="font-weight: 600;">=</span><span class="s2" style="color: #d14;">"<span class="idiff left right">git://git.debian.org/pkg-privacy/packages/torbrowser-launcher.git</span>"</span></span>
</pre>
</td>
</tr>
<tr class="line_holder new" id="" style="line-height: 1.6;">
<td class="diff-line-num new old_line" data-linenumber="435" 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="diff-line-num new new_line" data-linenumber="434" 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">
434
</td>
<td class="line_content new noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0">
<pre style="margin: 0;">+<span id="LC434" class="line" lang="shell"> <span class="nb" style="color: #0086b3;">local </span><span class="nv" style="color: teal;">DEBIAN_GIT_URL</span><span class="o" style="font-weight: 600;">=</span><span class="s2" style="color: #d14;">"<span class="idiff left right">https://salsa.debian.org/pkg-privacy-team/torbrowser-launcher</span>"</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="435" 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">
435
</td>
<td class="diff-line-num new_line" data-linenumber="435" 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">
435
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC435" class="line" lang="shell"> <span class="nb" style="color: #0086b3;">local </span><span class="nv" style="color: teal;">DEBIAN_BRANCH</span><span class="o" style="font-weight: 600;">=</span><span class="s2" style="color: #d14;">"debian/</span><span class="nv" style="color: teal;">$1</span><span class="s2" style="color: #d14;">"</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="436" 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">
436
</td>
<td class="diff-line-num new_line" data-linenumber="436" 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">
436
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC436" class="line" lang="shell"> <span class="nb" style="color: #0086b3;">echo</span> <span class="s2" style="color: #d14;">"</span><span class="k" style="font-weight: 600;">$(</span><span class="nb" style="color: #0086b3;">date</span> <span class="nt" style="color: navy;">-u</span><span class="k" style="font-weight: 600;">)</span><span class="s2" style="color: #d14;"> - Merging branch </span><span class="nv" style="color: teal;">$DEBIAN_BRANCH</span><span class="s2" style="color: #d14;"> into </span><span class="nv" style="color: teal;">$COMMIT_HASH</span><span class="s2" style="color: #d14;"> now."</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="437" 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">
437
</td>
<td class="diff-line-num new_line" data-linenumber="437" 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">
437
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC437" class="line" lang="shell"> <span class="nb" style="color: #0086b3;">echo</span></span>
</pre>
</td>
</tr>
</table>
<br>
</li>
<li id="322b62fcca1bf5c65228491407d362901e7a82e7">
<a href="https://salsa.debian.org/qa/jenkins.debian.net/commit/adf9104a07060b783de91e06cd597934d5761d35#322b62fcca1bf5c65228491407d362901e7a82e7"><strong>job-cfg/torbrowser-launcher.yaml</strong></a>
<hr>
<table class="code white" style="font-family: monospace; font-size: 12px;" 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="193" 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="193" 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">@@ -193,7 +193,7 @@</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="193" 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">
193
</td>
<td class="diff-line-num new_line" data-linenumber="193" 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">
193
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC193" class="line" lang="yaml"> <span class="pi">-</span> <span class="s1" style="color: #d14;">'</span><span class="s" style="color: #d14;">{name}_test_on_{dist}_amd64_from_git_branch_{g_i_t_branch}'</span><span class="pi">:</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="194" 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">
194
</td>
<td class="diff-line-num new_line" data-linenumber="194" 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">
194
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC194" class="line" lang="yaml"> <span class="na" style="color: teal;">my_description</span><span class="pi">:</span> <span class="s1" style="color: #d14;">'</span><span class="s" style="color: #d14;">Test</span><span class="nv" style="color: teal;"> </span><span class="s" style="color: #d14;">torbrowser-launcher{my_opt_desc}</span><span class="nv" style="color: teal;"> </span><span class="s" style="color: #d14;">on</span><span class="nv" style="color: teal;"> </span><span class="s" style="color: #d14;">{dist}/amd64</span><span class="nv" style="color: teal;"> </span><span class="s" style="color: #d14;">using</span><span class="nv" style="color: teal;"> </span><span class="s" style="color: #d14;">the</span><span class="nv" style="color: teal;"> </span><span class="s" style="color: #d14;">branch</span><span class="nv" style="color: teal;"> </span><span class="s" style="color: #d14;">{my_gitbranch}.'</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="195" 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">
195
</td>
<td class="diff-line-num new_line" data-linenumber="195" 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">
195
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC195" class="line" lang="yaml"> <span class="na" style="color: teal;">my_timed</span><span class="pi">:</span> <span class="s1" style="color: #d14;">'</span><span class="s" style="color: #d14;">23</span><span class="nv" style="color: teal;"> </span><span class="s" style="color: #d14;">{my_hour}</span><span class="nv" style="color: teal;"> </span><span class="s" style="color: #d14;">1</span><span class="nv" style="color: teal;"> </span><span class="s" style="color: #d14;">*</span><span class="nv" style="color: teal;"> </span><span class="s" style="color: #d14;">*'</span></span>
</pre>
</td>
</tr>
<tr class="line_holder old" id="" style="line-height: 1.6;">
<td class="diff-line-num old old_line" data-linenumber="196" 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">
196
</td>
<td class="diff-line-num new_line old" data-linenumber="196" 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 noteable_line old" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#fbe9eb">
<pre style="margin: 0;">-<span id="LC196" class="line" lang="yaml"> <span class="na" style="color: teal;">my_gitrepo</span><span class="pi">:</span> <span class="s1" style="color: #d14;">'</span><span class="s" style="color: #d14;"><span class="idiff left right">git://git.debian.org/pkg-privacy/packages/torbrowser-launcher.git</span>'</span></span>
</pre>
</td>
</tr>
<tr class="line_holder new" id="" style="line-height: 1.6;">
<td class="diff-line-num new old_line" data-linenumber="197" 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="diff-line-num new new_line" data-linenumber="196" 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">
196
</td>
<td class="line_content new noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0">
<pre style="margin: 0;">+<span id="LC196" class="line" lang="yaml"> <span class="na" style="color: teal;">my_gitrepo</span><span class="pi">:</span> <span class="s1" style="color: #d14;">'</span><span class="s" style="color: #d14;"><span class="idiff left right">https://salsa.debian.org/pkg-privacy-team/torbrowser-launcher</span>'</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="197" 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">
197
</td>
<td class="diff-line-num new_line" data-linenumber="197" 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">
197
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC197" class="line" lang="yaml"> <span class="na" style="color: teal;">my_opt_arg</span><span class="pi">:</span> <span class="s1" style="color: #d14;">'</span><span class="s" style="color: #d14;">'</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="198" 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">
198
</td>
<td class="diff-line-num new_line" data-linenumber="198" 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">
198
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC198" class="line" lang="yaml"> <span class="na" style="color: teal;">my_opt_desc</span><span class="pi">:</span> <span class="s1" style="color: #d14;">'</span><span class="s" style="color: #d14;">'</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="199" 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">
199
</td>
<td class="diff-line-num new_line" data-linenumber="199" 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">
199
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC199" class="line" lang="yaml"> <span class="na" style="color: teal;">g_i_t_branch</span><span class="pi">:</span></span>
</pre>
</td>
</tr>
</table>
<br>
</li>
</div>
<div class="footer" style="margin-top: 10px;">
<p style="font-size: small; color: #777;">
—
<br>
<a href="https://salsa.debian.org/qa/jenkins.debian.net/commit/adf9104a07060b783de91e06cd597934d5761d35">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/adf9104a07060b783de91e06cd597934d5761d35"}}</script>
</p>
</div>
</body>
</html>