<!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>
Mattia Rizzolo 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/44cae15f4e99b8a86b1b1c84ace48623abd453b4">44cae15f</a></strong>
<div>
<span>by Mattia Rizzolo</span>
<i>at 2021-05-02T22:37:25+02:00</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">reproducible debian: properly alternate amd64 and 686 kernels in the i386 builders
it's already this way, as apparently they are running the correct
kernel, but just don't try to install the amd64 kernel where we don't
need it
Signed-off-by: Mattia Rizzolo <mattia@debian.org>
</pre>
</li>
</ul>
<h4>1 changed file:</h4>
<ul>
<li class="file-stats">
<a href="#6ff6282ac74cc7287e3dd50fb4425669c13e79fc">
update_jdn.sh
</a>
</li>
</ul>
<h4>Changes:</h4>
<li id="6ff6282ac74cc7287e3dd50fb4425669c13e79fc">
<a href="https://salsa.debian.org/qa/jenkins.debian.net/-/commit/44cae15f4e99b8a86b1b1c84ace48623abd453b4#6ff6282ac74cc7287e3dd50fb4425669c13e79fc"><strong>update_jdn.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="650" 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="650" 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">@@ -650,10 +650,12 @@ if [ -f /etc/debian_version ] ; then</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="650" 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">
650
</td>
<td class="new_line diff-line-num" data-linenumber="650" 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">
650
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC650" class="line" lang="shell"> <span class="o" style="font-weight: 600;">||</span> <span class="o" style="font-weight: 600;">[</span> <span class="s2" style="color: #d14;">"</span><span class="nv" style="color: #008080;">$HOSTNAME</span><span class="s2" style="color: #d14;">"</span> <span class="o" style="font-weight: 600;">=</span> <span class="s2" style="color: #d14;">"osuosl172-amd64"</span> <span class="o" style="font-weight: 600;">]</span> <span class="p">;</span> <span class="k" style="font-weight: 600;">then</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="651" 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">
651
</td>
<td class="new_line diff-line-num" data-linenumber="651" 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">
651
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC651" class="line" lang="shell"><span class="k" style="font-weight: 600;"> </span><span class="nb" style="color: #0086b3;">sudo </span>apt <span class="nb" style="color: #0086b3;">install </span>linux-image-amd64/buster-backports <span class="o" style="font-weight: 600;">||</span> <span class="nb" style="color: #0086b3;">true</span> <span class="c" style="color: #998; font-style: italic;"># backport kernels are frequently uninstallable...</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="652" 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">
652
</td>
<td class="new_line diff-line-num" data-linenumber="652" 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">
652
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC652" class="line" lang="shell"> :</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="653" 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">
653
</td>
<td class="new_line diff-line-num old" data-linenumber="653" 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="LC653" class="line" lang="shell"> <span class="k" style="font-weight: 600;">elif</span> <span class="o" style="font-weight: 600;">[</span> <span class="s2" style="color: #d14;">"</span><span class="nv" style="color: #008080;">$HOSTNAME</span><span class="s2" style="color: #d14;">"</span> <span class="o" style="font-weight: 600;">=</span> <span class="s2" style="color: #d14;">"ionos6-i386"</span> <span class="o" style="font-weight: 600;">]</span> <span class="o" style="font-weight: 600;">||</span> <span class="o" style="font-weight: 600;">[</span> <span class="s2" style="color: #d14;">"</span><span class="nv" style="color: #008080;">$HOSTNAME</span><span class="s2" style="color: #d14;">"</span> <span class="o" style="font-weight: 600;">=</span> <span class="s2" style="color: #d14;">"ionos16-i386"</span> <span class="o" style="font-weight: 600;">]</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="654" 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">
654
</td>
<td class="new_line diff-line-num old" data-linenumber="653" 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="LC654" class="line" lang="shell"> <span class="o" style="font-weight: 600;">||</span> <span class="o" style="font-weight: 600;">[</span> <span class="s2" style="color: #d14;">"</span><span class="nv" style="color: #008080;">$HOSTNAME</span><span class="s2" style="color: #d14;">"</span> <span class="o" style="font-weight: 600;">=</span> <span class="s2" style="color: #d14;">"ionos2-i386"</span> <span class="o" style="font-weight: 600;">]</span> <span class="o" style="font-weight: 600;">||</span> <span class="o" style="font-weight: 600;">[</span> <span class="s2" style="color: #d14;">"</span><span class="nv" style="color: #008080;">$HOSTNAME</span><span class="s2" style="color: #d14;">"</span> <span class="o" style="font-weight: 600;">=</span> <span class="s2" style="color: #d14;">"ionos12-i386"</span> <span class="o" style="font-weight: 600;">]</span> <span class="p">;</span> <span class="k" style="font-weight: 600;">then</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="655" 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">
655
</td>
<td class="new_line diff-line-num old" data-linenumber="653" 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="LC655" class="line" lang="shell"> <span class="c" style="color: #998; font-style: italic;"># we dont vary the kernel on i386 atm, see #875990 + #876035</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="656" 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">
656
</td>
<td class="new_line diff-line-num old" data-linenumber="653" 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="LC656" class="line" lang="shell"> <span class="nb" style="color: #0086b3;">sudo </span>apt <span class="nb" style="color: #0086b3;">install </span>linux-image-amd64:amd64</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="657" 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="653" 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">
653
</td>
<td class="line_content new" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0">
<pre style="margin: 0;">+<span id="LC653" class="line" lang="shell"> <span class="k" style="font-weight: 600;">elif</span> <span class="o" style="font-weight: 600;">[</span> <span class="s2" style="color: #d14;">"</span><span class="nv" style="color: #008080;">$HOSTNAME</span><span class="s2" style="color: #d14;">"</span> <span class="o" style="font-weight: 600;">=</span> <span class="s2" style="color: #d14;">"ionos6-i386"</span> <span class="o" style="font-weight: 600;">]</span> <span class="o" style="font-weight: 600;">||</span> <span class="o" style="font-weight: 600;">[</span> <span class="s2" style="color: #d14;">"</span><span class="nv" style="color: #008080;">$HOSTNAME</span><span class="s2" style="color: #d14;">"</span> <span class="o" style="font-weight: 600;">=</span> <span class="s2" style="color: #d14;">"ionos16-i386"</span> <span class="o" style="font-weight: 600;">]</span> <span class="p">;</span> <span class="k" style="font-weight: 600;">then</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="657" 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="654" 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">
654
</td>
<td class="line_content new" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0">
<pre style="margin: 0;">+<span id="LC654" class="line" lang="shell"> <span class="c" style="color: #998; font-style: italic;"># run with the amd64 kernel in these i386 nodes</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="657" 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="655" 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">
655
</td>
<td class="line_content new" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0">
<pre style="margin: 0;">+<span id="LC655" class="line" lang="shell"> <span class="nb" style="color: #0086b3;">sudo </span>apt <span class="nb" style="color: #0086b3;">install </span>linux-image-amd64 linux-image-686-pae-</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="657" 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="656" 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">
656
</td>
<td class="line_content new" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0">
<pre style="margin: 0;">+<span id="LC656" class="line" lang="shell"> <span class="k" style="font-weight: 600;">elif</span> <span class="o" style="font-weight: 600;">[</span> <span class="s2" style="color: #d14;">"</span><span class="nv" style="color: #008080;">$HOSTNAME</span><span class="s2" style="color: #d14;">"</span> <span class="o" style="font-weight: 600;">=</span> <span class="s2" style="color: #d14;">"ionos2-i386"</span> <span class="o" style="font-weight: 600;">]</span> <span class="o" style="font-weight: 600;">||</span> <span class="o" style="font-weight: 600;">[</span> <span class="s2" style="color: #d14;">"</span><span class="nv" style="color: #008080;">$HOSTNAME</span><span class="s2" style="color: #d14;">"</span> <span class="o" style="font-weight: 600;">=</span> <span class="s2" style="color: #d14;">"ionos12-i386"</span> <span class="o" style="font-weight: 600;">]</span> <span class="p">;</span> <span class="k" style="font-weight: 600;">then</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="657" 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="657" 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">
657
</td>
<td class="line_content new" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0">
<pre style="margin: 0;">+<span id="LC657" class="line" lang="shell"> <span class="c" style="color: #998; font-style: italic;"># run with the i386 kernel in these i386 nodes</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="657" 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="658" 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">
658
</td>
<td class="line_content new" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0">
<pre style="margin: 0;">+<span id="LC658" class="line" lang="shell"> <span class="nb" style="color: #0086b3;">sudo </span>apt <span class="nb" style="color: #0086b3;">install </span>linux-image-686-pae linux-image-amd64-</span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="657" 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">
657
</td>
<td class="new_line diff-line-num" data-linenumber="659" 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">
659
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC659" class="line" lang="shell"> <span class="k" style="font-weight: 600;">elif</span> <span class="o" style="font-weight: 600;">[</span> <span class="s2" style="color: #d14;">"</span><span class="nv" style="color: #008080;">$HOSTNAME</span><span class="s2" style="color: #d14;">"</span> <span class="o" style="font-weight: 600;">=</span> <span class="s2" style="color: #d14;">"osuosl169-amd64"</span> <span class="o" style="font-weight: 600;">]</span> <span class="o" style="font-weight: 600;">||</span> <span class="o" style="font-weight: 600;">[</span> <span class="s2" style="color: #d14;">"</span><span class="nv" style="color: #008080;">$HOSTNAME</span><span class="s2" style="color: #d14;">"</span> <span class="o" style="font-weight: 600;">=</span> <span class="s2" style="color: #d14;">"osuosl170-amd64"</span> <span class="o" style="font-weight: 600;">]</span> <span class="o" style="font-weight: 600;">||</span> <span class="o" style="font-weight: 600;">[</span> <span class="s2" style="color: #d14;">"</span><span class="nv" style="color: #008080;">$HOSTNAME</span><span class="s2" style="color: #d14;">"</span> <span class="o" style="font-weight: 600;">=</span> <span class="s2" style="color: #d14;">"osuosl173-amd64"</span> <span class="o" style="font-weight: 600;">]</span><span class="p">;</span> <span class="k" style="font-weight: 600;">then</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="658" 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">
658
</td>
<td class="new_line diff-line-num" data-linenumber="660" 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">
660
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC660" class="line" lang="shell"> <span class="c" style="color: #998; font-style: italic;"># Arch Linux builds latest stuff which sometimes (eg, currentlt Qt) needs newer kernel to build...</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="659" 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">
659
</td>
<td class="new_line diff-line-num" data-linenumber="661" 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">
661
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC661" class="line" lang="shell"> <span class="nb" style="color: #0086b3;">sudo </span>apt <span class="nb" style="color: #0086b3;">install </span>linux-image-amd64/buster-backports <span class="o" style="font-weight: 600;">||</span> <span class="nb" style="color: #0086b3;">true</span> <span class="c" style="color: #998; font-style: italic;"># backport kernels are frequently uninstallable...</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/44cae15f4e99b8a86b1b1c84ace48623abd453b4">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/44cae15f4e99b8a86b1b1c84ace48623abd453b4"}}</script>
</p>
</div>
</body>
</html>