From 7a81b1be3c8fc52476c79f1427c80ddfc14b71c7 Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Sat, 25 Oct 2025 19:23:34 +0200 Subject: [PATCH 1/2] add local rpm - https://gitlab.confdroid.com/internal/confdroid_management/-/issues/284 --- manifests/r10k/install.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/r10k/install.pp b/manifests/r10k/install.pp index 30625ff..1fa037b 100644 --- a/manifests/r10k/install.pp +++ b/manifests/r10k/install.pp @@ -61,7 +61,7 @@ class puppet_cd::r10k::install ( exec { 'install rpm': command => "yum install -y ${pt_r10k_webhook_pkg}", - unless => "rpm -qa | grep ${pt_r10k_webhook_pkg}", + unless => 'rpm -qa | grep webhook-go', require => File[$pt_r10k_webhook_pkg], } } From 7a3dab9b622f824bd6acd106dc3832d2edf14ee9 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Sat, 25 Oct 2025 19:25:03 +0200 Subject: [PATCH 2/2] Recommit for updates in build 56 --- doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 f5de2b9..828aff0 100644 --- a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html +++ b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html @@ -227,7 +227,7 @@ class puppet_cd::r10k::install ( exec { 'install rpm': command => "yum install -y ${pt_r10k_webhook_pkg}", - unless => "rpm -qa | grep ${pt_r10k_webhook_pkg}", + unless => 'rpm -qa | grep webhook-go', require => File[$pt_r10k_webhook_pkg], } }