Skip to content

Commit 02f7e5e

Browse files
evgeniekohl
authored andcommitted
move repo definition to setup_acceptance_node
1 parent 2325c9e commit 02f7e5e

File tree

3 files changed

+11
-16
lines changed

3 files changed

+11
-16
lines changed

spec/acceptance/foreman_cli_plugins_spec.rb

-7
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,6 @@ class { 'foreman::cli':
6363
it_behaves_like 'an idempotent resource' do
6464
let(:manifest) do
6565
<<-PUPPET
66-
yumrepo { 'katello':
67-
baseurl => "http://yum.theforeman.org/katello/nightly/katello/el${facts['os']['release']['major']}/x86_64/",
68-
gpgcheck => 0,
69-
}
70-
7166
class { 'foreman::cli':
7267
foreman_url => 'https://foreman.example.com',
7368
username => 'admin',
@@ -77,8 +72,6 @@ class { 'foreman::cli':
7772
include foreman::cli::katello
7873
include foreman::cli::virt_who_configure
7974
include foreman::cli::rh_cloud
80-
81-
Yumrepo['katello'] -> Class['foreman::cli::katello']
8275
PUPPET
8376
end
8477
end

spec/acceptance/foreman_rh_cloud_spec.rb

-9
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,6 @@
66
it_behaves_like 'an idempotent resource' do
77
let(:manifest) do
88
<<-PUPPET
9-
yumrepo { 'katello':
10-
baseurl => "http://yum.theforeman.org/katello/nightly/katello/el${facts['os']['release']['major']}/x86_64/",
11-
gpgcheck => 0,
12-
}
13-
yumrepo { 'candlepin':
14-
baseurl => "https://yum.theforeman.org/candlepin/4.4/el${facts['os']['release']['major']}/x86_64/",
15-
gpgcheck => 0,
16-
}
17-
189
include foreman
1910
include foreman::plugin::rh_cloud
2011
PUPPET

spec/setup_acceptance_node.pp

+11
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,17 @@
22
repo => 'nightly',
33
}
44

5+
if $facts['os']['family'] == 'RedHat' {
6+
yumrepo { 'katello':
7+
baseurl => "http://yum.theforeman.org/katello/nightly/katello/el${facts['os']['release']['major']}/x86_64/",
8+
gpgcheck => 0,
9+
}
10+
yumrepo { 'candlepin':
11+
baseurl => "https://yum.theforeman.org/candlepin/4.4/el${facts['os']['release']['major']}/x86_64/",
12+
gpgcheck => 0,
13+
}
14+
}
15+
516
# Not /etc/foreman because purging removes that
617
$directory = '/etc/foreman-certs'
718
$certificate = "${directory}/certificate.pem"

0 commit comments

Comments
 (0)