From f5e8fadecbffb50633d4a5bc2a18187e64678b6c Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Sat, 25 Oct 2025 19:16:22 +0200 Subject: [PATCH 1/2] add local rpm - https://gitlab.confdroid.com/internal/confdroid_management/-/issues/284 --- manifests/r10k/install.pp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/manifests/r10k/install.pp b/manifests/r10k/install.pp index d3e430c..30625ff 100644 --- a/manifests/r10k/install.pp +++ b/manifests/r10k/install.pp @@ -60,7 +60,8 @@ class puppet_cd::r10k::install ( } exec { 'install rpm': - command => "yum install ${pt_r10k_webhook_pkg}", + command => "yum install -y ${pt_r10k_webhook_pkg}", + unless => "rpm -qa | grep ${pt_r10k_webhook_pkg}", require => File[$pt_r10k_webhook_pkg], } } From c49d441591b103303b10eea4976c9247480e7631 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Sat, 25 Oct 2025 19:17:55 +0200 Subject: [PATCH 2/2] Recommit for updates in build 55 --- doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html index f353ed4..f5de2b9 100644 --- a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html +++ b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html @@ -163,7 +163,8 @@ 65 66 67 -68 +68 +69
# File 'manifests/r10k/install.pp', line 6
@@ -225,7 +226,8 @@ class puppet_cd::r10k::install (
       }
 
       exec { 'install rpm':
-        command => "yum install ${pt_r10k_webhook_pkg}",
+        command => "yum install -y ${pt_r10k_webhook_pkg}",
+        unless  => "rpm -qa | grep ${pt_r10k_webhook_pkg}",
         require => File[$pt_r10k_webhook_pkg],
       }
     }