Skip to content

Commit

Permalink
move repo definition to setup_acceptance_node
Browse files Browse the repository at this point in the history
  • Loading branch information
evgeni authored and ekohl committed Jan 23, 2025
1 parent 2325c9e commit 02f7e5e
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 16 deletions.
7 changes: 0 additions & 7 deletions spec/acceptance/foreman_cli_plugins_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,6 @@ class { 'foreman::cli':
it_behaves_like 'an idempotent resource' do
let(:manifest) do
<<-PUPPET
yumrepo { 'katello':
baseurl => "http://yum.theforeman.org/katello/nightly/katello/el${facts['os']['release']['major']}/x86_64/",
gpgcheck => 0,
}
class { 'foreman::cli':
foreman_url => 'https://foreman.example.com',
username => 'admin',
Expand All @@ -77,8 +72,6 @@ class { 'foreman::cli':
include foreman::cli::katello
include foreman::cli::virt_who_configure
include foreman::cli::rh_cloud
Yumrepo['katello'] -> Class['foreman::cli::katello']
PUPPET
end
end
Expand Down
9 changes: 0 additions & 9 deletions spec/acceptance/foreman_rh_cloud_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,6 @@
it_behaves_like 'an idempotent resource' do
let(:manifest) do
<<-PUPPET
yumrepo { 'katello':
baseurl => "http://yum.theforeman.org/katello/nightly/katello/el${facts['os']['release']['major']}/x86_64/",
gpgcheck => 0,
}
yumrepo { 'candlepin':
baseurl => "https://yum.theforeman.org/candlepin/4.4/el${facts['os']['release']['major']}/x86_64/",
gpgcheck => 0,
}
include foreman
include foreman::plugin::rh_cloud
PUPPET
Expand Down
11 changes: 11 additions & 0 deletions spec/setup_acceptance_node.pp
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,17 @@
repo => 'nightly',
}

if $facts['os']['family'] == 'RedHat' {
yumrepo { 'katello':
baseurl => "http://yum.theforeman.org/katello/nightly/katello/el${facts['os']['release']['major']}/x86_64/",
gpgcheck => 0,
}
yumrepo { 'candlepin':
baseurl => "https://yum.theforeman.org/candlepin/4.4/el${facts['os']['release']['major']}/x86_64/",
gpgcheck => 0,
}
}

# Not /etc/foreman because purging removes that
$directory = '/etc/foreman-certs'
$certificate = "${directory}/certificate.pem"
Expand Down

0 comments on commit 02f7e5e

Please sign in to comment.