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": [
|
"cSpell.words": [
|
||||||
"descr",
|
"descr",
|
||||||
|
"dport",
|
||||||
"fontconfig",
|
"fontconfig",
|
||||||
"gpgcheck",
|
"gpgcheck",
|
||||||
"NOPASSWD",
|
"NOPASSWD",
|
||||||
|
"repodata",
|
||||||
|
"repomd",
|
||||||
"requiretty",
|
"requiretty",
|
||||||
"yumrepo"
|
"yumrepo"
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -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:
|
||||||
|
|||||||
@@ -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'],
|
||||||
# }
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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',
|
||||||
|
|||||||
Reference in New Issue
Block a user