confdroid/confdroid_jenkins
1
0
Fork 0
Code Issues Projects Wiki Activity

Merge build 2 into master

Browse Source
This commit is contained in:
Jenkins Server
2026-04-16 15:42:42 +02:00
parent 0f1be9eea8 d48be49fc9
commit 16362ba2ae
7 changed files with 82 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.vscode/settings.json vendored
View File

@@ -1,9 +1,12 @@
{ {
"cSpell.words": [ "cSpell.words": [
"descr", "descr",
"dport",
"fontconfig", "fontconfig",
"gpgcheck", "gpgcheck",
"NOPASSWD", "NOPASSWD",
"repodata",
"repomd",
"requiretty", "requiretty",
"yumrepo" "yumrepo"
] ]

2
doc/puppet_classes/confdroid_jenkins_3A_3Amain_3A_3Ainstall.html
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:

22
doc/puppet_classes/confdroid_jenkins_3A_3Amain_3A_3Ayumrepo.html
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>
@@ -135,20 +137,22 @@ class confdroid_jenkins::main::yumrepo (
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,
type =&gt; &#39;rpm-md&#39;,
gpgcheck =&gt; $js_gpg_check, gpgcheck =&gt; $js_gpg_check,
repo_gpgcheck =&gt; 1,
enabled =&gt; $js_repo_enabled, 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>

29
doc/puppet_classes/confdroid_jenkins_3A_3Aparams.html
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,7 +405,8 @@
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>
@@ -403,9 +417,10 @@ class confdroid_jenkins::params (
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;,

2
manifests/main/install.pp
View File

@@ -7,7 +7,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:

18
manifests/main/yumrepo.pp
View File

@@ -10,19 +10,21 @@ class confdroid_jenkins::main::yumrepo (
yumrepo { 'jenkins': yumrepo { 'jenkins':
descr => 'Jenkins-stable', descr => 'Jenkins-stable',
baseurl => $js_base_url, baseurl => $js_base_url,
type => 'rpm-md',
gpgcheck => $js_gpg_check, gpgcheck => $js_gpg_check,
repo_gpgcheck => 1,
enabled => $js_repo_enabled, enabled => $js_repo_enabled,
} }
# import rpm key # import rpm key
# exec { $js_key: exec { $js_key:
# command => "rpm --import ${js_base_url}/${js_key}", command => "rpm --import ${js_base_url}/${js_key}",
# path => '/bin:/usr/bin:/sbin:/usr/sbin', path => '/bin:/usr/bin:/sbin:/usr/sbin',
# cwd => '/tmp', cwd => '/tmp',
# user => 'root', user => 'root',
# unless => "rpm -q ${js_key_code} 2>/dev/null", unless => "rpm -q ${js_key_code} 2>/dev/null",
# require => Yumrepo['jenkins'], require => Yumrepo['jenkins'],
# } }
} }
} }

7
manifests/params.pp
View File

@@ -22,9 +22,10 @@ class confdroid_jenkins::params (
String $pkg_ensure = 'latest', String $pkg_ensure = 'latest',
String $js_gpg_check = '1', String $js_gpg_check = '1',
String $js_repo_enabled = '1', String $js_repo_enabled = '1',
String $js_base_url = 'https://pkg.jenkins.io/redhat-stable/', String $js_gpg_repo_check = '1',
String $js_key = 'jenkins.io-2023.key', String $js_base_url = 'https://pkg.jenkins.io/rpm-stable',
String $js_key_code = 'gpg-pubkey-ef5975ca-6421ce2b', String $js_key = 'repodata/repomd.xml.key',
String $js_key_code = 'gpg-pubkey-14abfc68-69494683',
# server fqdn # server fqdn
String $js_host_fqdn = 'jenkins.example.net', String $js_host_fqdn = 'jenkins.example.net',