Recommit for updates in build 2

This commit is contained in:
Jenkins Server
2026-04-16 15:42:40 +02:00
parent a00078ff6d
commit d48be49fc9
3 changed files with 50 additions and 31 deletions

View File

@@ -121,7 +121,7 @@ class confdroid_jenkins::main::install (
) inherits confdroid_jenkins::params { ) inherits confdroid_jenkins::params {
if $fqdn == $js_host_fqdn { if $fqdn == $js_host_fqdn {
require java_cd require confdroid_java
require confdroid_jenkins::main::yumrepo require confdroid_jenkins::main::yumrepo
package { $reqpackages: package { $reqpackages:

View File

@@ -123,7 +123,9 @@
25 25
26 26
27 27
28</pre> 28
29
30</pre>
</td> </td>
<td> <td>
<pre class="code"><span class="info file"># File 'manifests/main/yumrepo.pp', line 6</span> <pre class="code"><span class="info file"># File 'manifests/main/yumrepo.pp', line 6</span>
@@ -133,22 +135,24 @@ class confdroid_jenkins::main::yumrepo (
) inherits confdroid_jenkins::params { ) inherits confdroid_jenkins::params {
if $fqdn == $js_host_fqdn { if $fqdn == $js_host_fqdn {
yumrepo { &#39;jenkins&#39;: yumrepo { &#39;jenkins&#39;:
descr =&gt; &#39;Jenkins-stable&#39;, descr =&gt; &#39;Jenkins-stable&#39;,
baseurl =&gt; $js_base_url, baseurl =&gt; $js_base_url,
gpgcheck =&gt; $js_gpg_check, type =&gt; &#39;rpm-md&#39;,
enabled =&gt; $js_repo_enabled, gpgcheck =&gt; $js_gpg_check,
repo_gpgcheck =&gt; 1,
enabled =&gt; $js_repo_enabled,
} }
# import rpm key # import rpm key
# exec { $js_key: exec { $js_key:
# command =&gt; &quot;rpm --import ${js_base_url}/${js_key}&quot;, command =&gt; &quot;rpm --import ${js_base_url}/${js_key}&quot;,
# path =&gt; &#39;/bin:/usr/bin:/sbin:/usr/sbin&#39;, path =&gt; &#39;/bin:/usr/bin:/sbin:/usr/sbin&#39;,
# cwd =&gt; &#39;/tmp&#39;, cwd =&gt; &#39;/tmp&#39;,
# user =&gt; &#39;root&#39;, user =&gt; &#39;root&#39;,
# unless =&gt; &quot;rpm -q ${js_key_code} 2&gt;/dev/null&quot;, unless =&gt; &quot;rpm -q ${js_key_code} 2&gt;/dev/null&quot;,
# require =&gt; Yumrepo[&#39;jenkins&#39;], require =&gt; Yumrepo[&#39;jenkins&#39;],
# } }
} }
}</pre> }</pre>
</td> </td>

View File

@@ -208,7 +208,7 @@
<span class='type'>(<tt>String</tt>)</span> <span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;https://pkg.jenkins.io/redhat-stable/&#39;</tt>)</em> <em class="default">(defaults to: <tt>&#39;https://pkg.jenkins.io/rpm-stable&#39;</tt>)</em>
&mdash; &mdash;
@@ -226,7 +226,7 @@
<span class='type'>(<tt>String</tt>)</span> <span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;jenkins.io-2023.key&#39;</tt>)</em> <em class="default">(defaults to: <tt>&#39;repodata/repomd.xml.key&#39;</tt>)</em>
&mdash; &mdash;
@@ -244,7 +244,7 @@
<span class='type'>(<tt>String</tt>)</span> <span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;gpg-pubkey-ef5975ca-6421ce2b&#39;</tt>)</em> <em class="default">(defaults to: <tt>&#39;gpg-pubkey-14abfc68-69494683&#39;</tt>)</em>
&mdash; &mdash;
@@ -344,6 +344,19 @@
</li> </li>
<li>
<span class='name'>js_gpg_repo_check</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;1&#39;</tt>)</em>
</li>
</ul> </ul>
@@ -392,32 +405,34 @@
53 53
54 54
55 55
56</pre> 56
57</pre>
</td> </td>
<td> <td>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 19</span> <pre class="code"><span class="info file"># File 'manifests/params.pp', line 19</span>
class confdroid_jenkins::params ( class confdroid_jenkins::params (
Array $reqpackages = [&#39;jenkins&#39;,&#39;fontconfig&#39;], Array $reqpackages = [&#39;jenkins&#39;,&#39;fontconfig&#39;],
String $pkg_ensure = &#39;latest&#39;, String $pkg_ensure = &#39;latest&#39;,
String $js_gpg_check = &#39;1&#39;, String $js_gpg_check = &#39;1&#39;,
String $js_repo_enabled = &#39;1&#39;, String $js_repo_enabled = &#39;1&#39;,
String $js_base_url = &#39;https://pkg.jenkins.io/redhat-stable/&#39;, String $js_gpg_repo_check = &#39;1&#39;,
String $js_key = &#39;jenkins.io-2023.key&#39;, String $js_base_url = &#39;https://pkg.jenkins.io/rpm-stable&#39;,
String $js_key_code = &#39;gpg-pubkey-ef5975ca-6421ce2b&#39;, String $js_key = &#39;repodata/repomd.xml.key&#39;,
String $js_key_code = &#39;gpg-pubkey-14abfc68-69494683&#39;,
# server fqdn # server fqdn
String $js_host_fqdn = &#39;jenkins.example.net&#39;, String $js_host_fqdn = &#39;jenkins.example.net&#39;,
# firewall # firewall
Boolean $js_enable_fw = true, Boolean $js_enable_fw = true,
String $js_fw_rule = &#39;50&#39;, String $js_fw_rule = &#39;50&#39;,
String $js_jenkins_port = &#39;8080&#39;, String $js_jenkins_port = &#39;8080&#39;,
String $js_source_net = &#39;0.0.0.0/0&#39;, String $js_source_net = &#39;0.0.0.0/0&#39;,
# user # user
Boolean $js_use_sudo = false, Boolean $js_use_sudo = false,
) { ) {
# facts # facts