<!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/15754b6bec951c958c6763286a2dbd3057604133">15754b6b</a></strong>
<div>
<span>by Holger Levsen</span>
<i>at 2018-11-07T18:11:17Z</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">deal with disabled metaconfigs
Signed-off-by: Holger Levsen <holger@layer-acht.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/15754b6bec951c958c6763286a2dbd3057604133#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="653" 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="653" 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">@@ -653,10 +653,12 @@ if [ "$HOSTNAME" = "jenkins" ] || [ "$HOSTNAME" = "jenkins-test-vm" ] ; then</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="653" 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">
653
</td>
<td class="diff-line-num new_line" data-linenumber="653" 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">
653
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC653" class="line" lang="shell"> <span class="c" style="color: #998; font-style: italic;">#</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="654" 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">
654
</td>
<td class="diff-line-num new_line" data-linenumber="654" 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">
654
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC654" class="line" lang="shell"> <span class="nb" style="color: #0086b3;">cd</span> /srv/jenkins/job-cfg</span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="655" 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">
655
</td>
<td class="diff-line-num new_line" data-linenumber="655" 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">
655
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC655" class="line" lang="shell"> <span class="k" style="font-weight: 600;">for </span>metaconfig <span class="k" style="font-weight: 600;">in</span> <span class="k" style="font-weight: 600;">*</span>.yaml.py <span class="p">;</span> <span class="k" style="font-weight: 600;">do</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="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="diff-line-num new_line 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">
</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="LC656" class="line" lang="shell"><span class="k" style="font-weight: 600;"> </span><span class="nv" style="color: teal;">TMPFILE</span><span class="o" style="font-weight: 600;">=</span><span class="k" style="font-weight: 600;">$(</span><span class="nb" style="color: #0086b3;">sudo</span> <span class="nt" style="color: navy;">-u</span> jenkins-adm <span class="nb" style="color: #0086b3;">mktemp</span><span class="k" 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="657" 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">
657
</td>
<td class="diff-line-num new_line 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">
</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="LC657" class="line" lang="shell"> ./<span class="nv" style="color: teal;">$metaconfig</span> | <span class="nb" style="color: #0086b3;">sudo</span> <span class="nt" style="color: navy;">-u</span> jenkins-adm <span class="nb" style="color: #0086b3;">tee</span> <span class="s2" style="color: #d14;">"</span><span class="nv" style="color: teal;">$TMPFILE</span><span class="s2" style="color: #d14;">"</span> <span class="o" style="font-weight: 600;">></span>/dev/null</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="658" 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">
658
</td>
<td class="diff-line-num new_line 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">
</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="LC658" class="line" lang="shell"> <span class="k" style="font-weight: 600;">if</span> <span class="o" style="font-weight: 600;">!</span> <span class="nb" style="color: #0086b3;">sudo</span> <span class="nt" style="color: navy;">-u</span> jenkins-adm cmp <span class="nt" style="color: navy;">-s</span> <span class="k" style="font-weight: 600;">${</span><span class="nv" style="color: teal;">metaconfig</span><span class="p">%.py</span><span class="k" style="font-weight: 600;">}</span> <span class="s2" style="color: #d14;">"</span><span class="nv" style="color: teal;">$TMPFILE</span><span class="s2" style="color: #d14;">"</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="diff-line-num old old_line" data-linenumber="659" 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">
659
</td>
<td class="diff-line-num new_line 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">
</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="LC659" class="line" lang="shell"><span class="k" style="font-weight: 600;"> </span><span class="nb" style="color: #0086b3;">sudo</span> <span class="nt" style="color: navy;">-u</span> jenkins-adm <span class="nb" style="color: #0086b3;">mv</span> <span class="s2" style="color: #d14;">"</span><span class="nv" style="color: teal;">$TMPFILE</span><span class="s2" style="color: #d14;">"</span> <span class="s2" style="color: #d14;">"</span><span class="k" style="font-weight: 600;">${</span><span class="nv" style="color: teal;">metaconfig</span><span class="p">%.py</span><span class="k" style="font-weight: 600;">}</span><span class="s2" style="color: #d14;">"</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="660" 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="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 noteable_line" 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;"> if</span> <span class="o" style="font-weight: 600;">[</span> <span class="nt" style="color: navy;">-f</span> <span class="nv" style="color: teal;">$metaconfig</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="diff-line-num new old_line" data-linenumber="660" 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="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 noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0">
<pre style="margin: 0;">+<span id="LC657" class="line" lang="shell"><span class="k" style="font-weight: 600;"> </span><span class="nv" style="color: teal;">TMPFILE</span><span class="o" style="font-weight: 600;">=</span><span class="k" style="font-weight: 600;">$(</span><span class="nb" style="color: #0086b3;">sudo</span> <span class="nt" style="color: navy;">-u</span> jenkins-adm <span class="nb" style="color: #0086b3;">mktemp</span><span class="k" style="font-weight: 600;">)</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="660" 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="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 noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0">
<pre style="margin: 0;">+<span id="LC658" class="line" lang="shell"> ./<span class="nv" style="color: teal;">$metaconfig</span> | <span class="nb" style="color: #0086b3;">sudo</span> <span class="nt" style="color: navy;">-u</span> jenkins-adm <span class="nb" style="color: #0086b3;">tee</span> <span class="s2" style="color: #d14;">"</span><span class="nv" style="color: teal;">$TMPFILE</span><span class="s2" style="color: #d14;">"</span> <span class="o" style="font-weight: 600;">></span>/dev/null</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="660" 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="659" 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">
659
</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="LC659" class="line" lang="shell"> <span class="k" style="font-weight: 600;">if</span> <span class="o" style="font-weight: 600;">!</span> <span class="nb" style="color: #0086b3;">sudo</span> <span class="nt" style="color: navy;">-u</span> jenkins-adm cmp <span class="nt" style="color: navy;">-s</span> <span class="k" style="font-weight: 600;">${</span><span class="nv" style="color: teal;">metaconfig</span><span class="p">%.py</span><span class="k" style="font-weight: 600;">}</span> <span class="s2" style="color: #d14;">"</span><span class="nv" style="color: teal;">$TMPFILE</span><span class="s2" style="color: #d14;">"</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="diff-line-num new old_line" data-linenumber="660" 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="660" 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">
660
</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="LC660" class="line" lang="shell"><span class="k" style="font-weight: 600;"> </span><span class="nb" style="color: #0086b3;">sudo</span> <span class="nt" style="color: navy;">-u</span> jenkins-adm <span class="nb" style="color: #0086b3;">mv</span> <span class="s2" style="color: #d14;">"</span><span class="nv" style="color: teal;">$TMPFILE</span><span class="s2" style="color: #d14;">"</span> <span class="s2" style="color: #d14;">"</span><span class="k" style="font-weight: 600;">${</span><span class="nv" style="color: teal;">metaconfig</span><span class="p">%.py</span><span class="k" style="font-weight: 600;">}</span><span class="s2" style="color: #d14;">"</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="660" 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="661" 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">
661
</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="LC661" class="line" lang="shell"> <span class="k" style="font-weight: 600;">fi</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" 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="diff-line-num new_line" data-linenumber="662" 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">
662
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC662" class="line" lang="shell"><span class="k" style="font-weight: 600;"> fi</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" 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="diff-line-num new_line" data-linenumber="663" 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">
663
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC663" class="line" lang="shell"><span class="k" style="font-weight: 600;"> done</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="662" 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">
662
</td>
<td class="diff-line-num new_line" data-linenumber="664" 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">
664
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC664" class="line" lang="shell"><span class="k" style="font-weight: 600;"> for </span>config <span class="k" style="font-weight: 600;">in</span> <span class="k" style="font-weight: 600;">*</span>.yaml <span class="p">;</span> <span class="k" style="font-weight: 600;">do</span></span>
</pre>
</td>
</tr>
</table>
<br>
</li>
</div>
<div class="footer" style="margin-top: 10px;">
<p style="font-size: small; color: #777777;">
—
<br>
<a href="https://salsa.debian.org/qa/jenkins.debian.net/commit/15754b6bec951c958c6763286a2dbd3057604133">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/15754b6bec951c958c6763286a2dbd3057604133"}}</script>
</p>
</div>
</body>
</html>