From 07eb81d5e6b4faedb1c2c521517113a6f0f48015 Mon Sep 17 00:00:00 2001 From: 12ww1160 <12ww1160@confdroid.com> Date: Thu, 16 Apr 2026 15:41:22 +0200 Subject: [PATCH 1/2] OP#581 fix repo and keys for Rocky9 --- .vscode/settings.json | 3 +++ manifests/main/install.pp | 2 +- manifests/main/yumrepo.pp | 26 ++++++++++++++------------ manifests/params.pp | 27 ++++++++++++++------------- 4 files changed, 32 insertions(+), 26 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index fe53574..89b1287 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,9 +1,12 @@ { "cSpell.words": [ "descr", + "dport", "fontconfig", "gpgcheck", "NOPASSWD", + "repodata", + "repomd", "requiretty", "yumrepo" ] diff --git a/manifests/main/install.pp b/manifests/main/install.pp index dd0e755..03aa268 100644 --- a/manifests/main/install.pp +++ b/manifests/main/install.pp @@ -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: diff --git a/manifests/main/yumrepo.pp b/manifests/main/yumrepo.pp index a87d8e3..957d674 100644 --- a/manifests/main/yumrepo.pp +++ b/manifests/main/yumrepo.pp @@ -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'], + } } } diff --git a/manifests/params.pp b/manifests/params.pp index e13e60e..6f24e90 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -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 From d48be49fc997e61fcde24f43ec75c0a81176ee7f Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Thu, 16 Apr 2026 15:42:40 +0200 Subject: [PATCH 2/2] Recommit for updates in build 2 --- ...fdroid_jenkins_3A_3Amain_3A_3Ainstall.html | 2 +- ...fdroid_jenkins_3A_3Amain_3A_3Ayumrepo.html | 30 +++++++----- .../confdroid_jenkins_3A_3Aparams.html | 49 ++++++++++++------- 3 files changed, 50 insertions(+), 31 deletions(-) diff --git a/doc/puppet_classes/confdroid_jenkins_3A_3Amain_3A_3Ainstall.html b/doc/puppet_classes/confdroid_jenkins_3A_3Amain_3A_3Ainstall.html index dcadf41..ccb4382 100644 --- a/doc/puppet_classes/confdroid_jenkins_3A_3Amain_3A_3Ainstall.html +++ b/doc/puppet_classes/confdroid_jenkins_3A_3Amain_3A_3Ainstall.html @@ -121,7 +121,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: diff --git a/doc/puppet_classes/confdroid_jenkins_3A_3Amain_3A_3Ayumrepo.html b/doc/puppet_classes/confdroid_jenkins_3A_3Amain_3A_3Ayumrepo.html index a92650f..40dd56e 100644 --- a/doc/puppet_classes/confdroid_jenkins_3A_3Amain_3A_3Ayumrepo.html +++ b/doc/puppet_classes/confdroid_jenkins_3A_3Amain_3A_3Ayumrepo.html @@ -123,7 +123,9 @@ 25 26 27 -28 +28 +29 +30 
# File 'manifests/main/yumrepo.pp', line 6
@@ -133,22 +135,24 @@ 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'],
+    }
   }
 }
diff --git a/doc/puppet_classes/confdroid_jenkins_3A_3Aparams.html b/doc/puppet_classes/confdroid_jenkins_3A_3Aparams.html index d7a0ef4..cdcaf33 100644 --- a/doc/puppet_classes/confdroid_jenkins_3A_3Aparams.html +++ b/doc/puppet_classes/confdroid_jenkins_3A_3Aparams.html @@ -208,7 +208,7 @@ (String) - (defaults to: 'https://pkg.jenkins.io/redhat-stable/') + (defaults to: 'https://pkg.jenkins.io/rpm-stable') — @@ -226,7 +226,7 @@ (String) - (defaults to: 'jenkins.io-2023.key') + (defaults to: 'repodata/repomd.xml.key') — @@ -244,7 +244,7 @@ (String) - (defaults to: 'gpg-pubkey-ef5975ca-6421ce2b') + (defaults to: 'gpg-pubkey-14abfc68-69494683') — @@ -344,6 +344,19 @@ +
  • + + js_gpg_repo_check + + + (String) + + + (defaults to: '1') + + +
    • + @@ -392,32 +405,34 @@ 53 54 55 -56 +56 +57 
    # File 'manifests/params.pp', line 19
 
 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