OP#581 fix repo and keys for Rocky9

This commit is contained in:
2026-04-16 15:41:22 +02:00
parent db468b4bbd
commit 07eb81d5e6
4 changed files with 32 additions and 26 deletions

View File

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

View File

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

View File

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

View File

@@ -18,25 +18,26 @@
##############################################################################
class confdroid_jenkins::params (
Array $reqpackages = ['jenkins','fontconfig'],
String $pkg_ensure = 'latest',
String $js_gpg_check = '1',
String $js_repo_enabled = '1',
String $js_base_url = 'https://pkg.jenkins.io/redhat-stable/',
String $js_key = 'jenkins.io-2023.key',
String $js_key_code = 'gpg-pubkey-ef5975ca-6421ce2b',
Array $reqpackages = ['jenkins','fontconfig'],
String $pkg_ensure = 'latest',
String $js_gpg_check = '1',
String $js_repo_enabled = '1',
String $js_gpg_repo_check = '1',
String $js_base_url = 'https://pkg.jenkins.io/rpm-stable',
String $js_key = 'repodata/repomd.xml.key',
String $js_key_code = 'gpg-pubkey-14abfc68-69494683',
# server fqdn
String $js_host_fqdn = 'jenkins.example.net',
String $js_host_fqdn = 'jenkins.example.net',
# firewall
Boolean $js_enable_fw = true,
String $js_fw_rule = '50',
String $js_jenkins_port = '8080',
String $js_source_net = '0.0.0.0/0',
Boolean $js_enable_fw = true,
String $js_fw_rule = '50',
String $js_jenkins_port = '8080',
String $js_source_net = '0.0.0.0/0',
# user
Boolean $js_use_sudo = false,
Boolean $js_use_sudo = false,
) {
# facts