OP#581 fix repo and keys for Rocky9
This commit is contained in:
3
.vscode/settings.json
vendored
3
.vscode/settings.json
vendored
@@ -1,9 +1,12 @@
|
||||
{
|
||||
"cSpell.words": [
|
||||
"descr",
|
||||
"dport",
|
||||
"fontconfig",
|
||||
"gpgcheck",
|
||||
"NOPASSWD",
|
||||
"repodata",
|
||||
"repomd",
|
||||
"requiretty",
|
||||
"yumrepo"
|
||||
]
|
||||
|
||||
@@ -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:
|
||||
|
||||
@@ -10,19 +10,21 @@ class confdroid_jenkins::main::yumrepo (
|
||||
yumrepo { 'jenkins':
|
||||
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'],
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -22,9 +22,10 @@ class confdroid_jenkins::params (
|
||||
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',
|
||||
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',
|
||||
|
||||
Reference in New Issue
Block a user