3
0

Merge branch 'jenkins-build-6' into 'master'

Auto-merge for build 6

See merge request puppet/puppet_cd!4
This commit is contained in:
2025-10-21 19:50:35 +00:00
5 changed files with 12 additions and 17 deletions

View File

@@ -17,6 +17,7 @@
"pydantic", "pydantic",
"pylint", "pylint",
"pytest", "pytest",
"repolist",
"requestlogging", "requestlogging",
"springframework", "springframework",
"startswith", "startswith",

View File

@@ -123,11 +123,6 @@
</li> </li>
<li>
<span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html" title="puppet_classes::puppet_cd::r10k::install (puppet_class)">puppet_cd::r10k::install</a></span>
</li>
<li> <li>
<span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html" title="puppet_classes::puppet_cd::r10k::webhook (puppet_class)">puppet_cd::r10k::webhook</a></span> <span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html" title="puppet_classes::puppet_cd::r10k::webhook (puppet_class)">puppet_cd::r10k::webhook</a></span>

View File

@@ -113,21 +113,14 @@
</li> </li>
<li id="object_puppet_classes::puppet_cd::r10k::install" class="even"> <li id="object_puppet_classes::puppet_cd::r10k::webhook" class="even">
<div class="item">
<span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html" title="puppet_classes::puppet_cd::r10k::install (puppet_class)">puppet_cd::r10k::install</a></span>
</div>
</li>
<li id="object_puppet_classes::puppet_cd::r10k::webhook" class="odd">
<div class="item"> <div class="item">
<span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html" title="puppet_classes::puppet_cd::r10k::webhook (puppet_class)">puppet_cd::r10k::webhook</a></span> <span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html" title="puppet_classes::puppet_cd::r10k::webhook (puppet_class)">puppet_cd::r10k::webhook</a></span>
</div> </div>
</li> </li>
<li id="object_puppet_classes::puppet_cd::server::service" class="even"> <li id="object_puppet_classes::puppet_cd::server::service" class="odd">
<div class="item"> <div class="item">
<span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Aserver_3A_3Aservice.html" title="puppet_classes::puppet_cd::server::service (puppet_class)">puppet_cd::server::service</a></span> <span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Aserver_3A_3Aservice.html" title="puppet_classes::puppet_cd::server::service (puppet_class)">puppet_cd::server::service</a></span>
</div> </div>

View File

@@ -77,8 +77,6 @@
<span class='object_link'><a href="puppet_cd_3A_3Amain_3A_3Ainstall.html" title="puppet_classes::puppet_cd::main::install (puppet_class)">puppet_cd::main::install</a></span><br/> <span class='object_link'><a href="puppet_cd_3A_3Amain_3A_3Ainstall.html" title="puppet_classes::puppet_cd::main::install (puppet_class)">puppet_cd::main::install</a></span><br/>
<span class='object_link'><a href="puppet_cd_3A_3Ar10k_3A_3Ainstall.html" title="puppet_classes::puppet_cd::r10k::install (puppet_class)">puppet_cd::r10k::install</a></span><br/>
<span class='object_link'><a href="puppet_cd_3A_3Ar10k_3A_3Awebhook.html" title="puppet_classes::puppet_cd::r10k::webhook (puppet_class)">puppet_cd::r10k::webhook</a></span><br/> <span class='object_link'><a href="puppet_cd_3A_3Ar10k_3A_3Awebhook.html" title="puppet_classes::puppet_cd::r10k::webhook (puppet_class)">puppet_cd::r10k::webhook</a></span><br/>
<span class='object_link'><a href="puppet_cd_3A_3Apuppetdb_3A_3Adirs.html" title="puppet_classes::puppet_cd::puppetdb::dirs (puppet_class)">puppet_cd::puppetdb::dirs</a></span><br/> <span class='object_link'><a href="puppet_cd_3A_3Apuppetdb_3A_3Adirs.html" title="puppet_classes::puppet_cd::puppetdb::dirs (puppet_class)">puppet_cd::puppetdb::dirs</a></span><br/>

View File

@@ -11,13 +11,21 @@ class puppet_cd::r10k::install (
# install required packages # install required packages
package { $pt_r10k_pkg: package { $pt_r10k_pkg:
ensure => $pt_pkg_ensure, ensure => $pt_pkg_ensure,
before => Package['r10k'], before => Exec['enable_crb'],
}
# enable CRB and install development_tools
exec { 'enable_crb':
command => 'dnf config-manager --set-enabled crb',
unless => 'dnf repolist --disabled | grep -qE "crb|CodeReady"',
path => ['/usr/bin', '/bin', '/usr/sbin', '/sbin'],
} }
# install r10k via gem # install r10k via gem
package { 'r10k': package { 'r10k':
ensure => $pt_pkg_ensure, ensure => $pt_pkg_ensure,
provider => gem, provider => gem,
require Exec['enable_crb'],
} }
# configure r10k.yaml # configure r10k.yaml