Skip to content

Commit 73b519b

Browse files
kajinamitkajinamit
committed
Install erlang from packagecloud in acceptance tests
Now we install rabbitmq from packagecloud by default. Install erlang from the same source so that we use the latest versions available for both rabbitmq and erlang.
1 parent dca42e6 commit 73b519b

10 files changed

+20
-77
lines changed

‎spec/acceptance/class_spec.rb

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,8 @@
1515
context 'default class inclusion' do
1616
let(:pp) do
1717
<<-EOS
18+
class { 'erlang': repo_source => 'packagecloud' } ->
1819
class { 'rabbitmq': }
19-
if $facts['os']['family'] == 'RedHat' {
20-
class { 'erlang': epel_enable => true}
21-
Class['erlang'] -> Class['rabbitmq']
22-
}
2320
EOS
2421
end
2522

@@ -51,13 +48,10 @@ class { 'erlang': epel_enable => true}
5148
context 'disable and stop service' do
5249
let(:pp) do
5350
<<-EOS
51+
class { 'erlang': repo_source => 'packagecloud' } ->
5452
class { 'rabbitmq':
5553
service_ensure => 'stopped',
5654
}
57-
if $facts['os']['family'] == 'RedHat' {
58-
class { 'erlang': epel_enable => true}
59-
Class['erlang'] -> Class['rabbitmq']
60-
}
6155
EOS
6256
end
6357

@@ -72,22 +66,16 @@ class { 'erlang': epel_enable => true}
7266
context 'service is unmanaged' do
7367
it 'runs successfully' do
7468
pp_pre = <<-EOS
69+
class { 'erlang': repo_source => 'packagecloud' } ->
7570
class { 'rabbitmq': }
76-
if $facts['os']['family'] == 'RedHat' {
77-
class { 'erlang': epel_enable => true}
78-
Class['erlang'] -> Class['rabbitmq']
79-
}
8071
EOS
8172

8273
pp = <<-EOS
74+
class { 'erlang': repo_source => 'packagecloud' } ->
8375
class { 'rabbitmq':
8476
service_manage => false,
8577
service_ensure => 'stopped',
8678
}
87-
if $facts['os']['family'] == 'RedHat' {
88-
class { 'erlang': epel_enable => true}
89-
Class['erlang'] -> Class['rabbitmq']
90-
}
9179
EOS
9280

9381
apply_manifest(pp_pre, catch_failures: true)

‎spec/acceptance/clustering_spec.rb

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
context 'rabbitmq::wipe_db_on_cookie_change => false' do
77
it 'runs successfully' do
88
pp = <<-EOS
9+
class { 'erlang': repo_source => 'packagecloud' } ->
910
class { 'rabbitmq':
1011
cluster => { 'name' => 'rabbit_cluster', 'init_node' => $facts['fqdn'] },
1112
config_cluster => true,
@@ -15,10 +16,6 @@ class { 'rabbitmq':
1516
erlang_cookie => 'TESTCOOKIE',
1617
wipe_db_on_cookie_change => false,
1718
}
18-
if $facts['os']['family'] == 'RedHat' {
19-
class { 'erlang': epel_enable => true}
20-
Class['erlang'] -> Class['rabbitmq']
21-
}
2219
EOS
2320

2421
apply_manifest(pp, expect_failures: true)
@@ -32,6 +29,7 @@ class { 'erlang': epel_enable => true}
3229
context 'rabbitmq::wipe_db_on_cookie_change => true' do
3330
it 'runs successfully' do
3431
pp = <<-EOS
32+
class { 'erlang': repo_source => 'packagecloud' } ->
3533
class { 'rabbitmq':
3634
cluster => { 'name' => 'rabbit_cluster', 'init_node' => $facts['fqdn'] },
3735
config_cluster => true,
@@ -41,10 +39,6 @@ class { 'rabbitmq':
4139
erlang_cookie => 'TESTCOOKIE',
4240
wipe_db_on_cookie_change => true,
4341
}
44-
if $facts['os']['family'] == 'RedHat' {
45-
class { 'erlang': epel_enable => true}
46-
Class['erlang'] -> Class['rabbitmq']
47-
}
4842
EOS
4943

5044
apply_manifest(pp, catch_failures: true)
@@ -78,6 +72,7 @@ class { 'erlang': epel_enable => true}
7872
context 'rabbitmq::cluster[:local_node] = foobar' do
7973
it 'runs successfully' do
8074
pp = <<-EOS
75+
class { 'erlang': repo_source => 'packagecloud' } ->
8176
class { 'rabbitmq':
8277
cluster => { 'name' => 'rabbit_cluster', 'init_node' => 'foobar', 'local_node' => 'foobar' },
8378
config_cluster => true,
@@ -86,10 +81,6 @@ class { 'rabbitmq':
8681
environment_variables => { 'RABBITMQ_USE_LONGNAME' => true, 'NODENAME' => 'rabbit@foobar' },
8782
erlang_cookie => 'TESTCOOKIE',
8883
}
89-
if $facts['os']['family'] == 'RedHat' {
90-
class { 'erlang': epel_enable => true}
91-
Class['erlang'] -> Class['rabbitmq']
92-
}
9384
EOS
9485

9586
apply_manifest(pp, expect_failures: true)

‎spec/acceptance/delete_guest_user_spec.rb

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,11 @@
66
context 'delete_guest_user' do
77
it 'runs successfully' do
88
pp = <<-EOS
9+
class { 'erlang': repo_source => 'packagecloud' } ->
910
class { 'rabbitmq':
1011
port => 5672,
1112
delete_guest_user => true,
1213
}
13-
if $facts['os']['family'] == 'RedHat' {
14-
class { 'erlang': epel_enable => true}
15-
Class['erlang'] -> Class['rabbitmq']
16-
}
1714
EOS
1815

1916
apply_manifest(pp, catch_failures: true)

‎spec/acceptance/parameter_spec.rb

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@
66
context 'create parameter resource' do
77
it 'runs successfully' do
88
pp = <<-EOS
9-
if $facts['os']['family'] == 'RedHat' {
10-
class { 'erlang': epel_enable => true }
11-
Class['erlang'] -> Class['rabbitmq']
12-
}
9+
class { 'erlang': repo_source => 'packagecloud' } ->
1310
class { 'rabbitmq':
1411
service_manage => true,
1512
port => 5672,

‎spec/acceptance/policy_spec.rb

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@
66
context 'create policy resource' do
77
it 'runs successfully' do
88
pp = <<-EOS
9-
if $facts['os']['family'] == 'RedHat' {
10-
class { 'erlang': epel_enable => true }
11-
Class['erlang'] -> Class['rabbitmq']
12-
}
9+
class { 'erlang': repo_source => 'packagecloud' } ->
1310
class { 'rabbitmq':
1411
service_manage => true,
1512
port => 5672,

‎spec/acceptance/queue_spec.rb

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@
66
context 'create binding and queue resources when using default management port' do
77
it 'runs successfully' do
88
pp = <<-EOS
9-
if $facts['os']['family'] == 'RedHat' {
10-
class { 'erlang': epel_enable => true }
11-
Class['erlang'] -> Class['rabbitmq']
12-
}
9+
class { 'erlang': repo_source => 'packagecloud' } ->
1310
class { 'rabbitmq':
1411
service_manage => true,
1512
port => 5672,
@@ -80,10 +77,7 @@ class { 'rabbitmq':
8077
context 'create multiple bindings when same source / destination / vhost but different routing keys' do
8178
it 'runs successfully' do
8279
pp = <<-EOS
83-
if $facts['os']['family'] == 'RedHat' {
84-
class { 'erlang': epel_enable => true }
85-
Class['erlang'] -> Class['rabbitmq']
86-
}
80+
class { 'erlang': repo_source => 'packagecloud' } ->
8781
class { 'rabbitmq':
8882
service_manage => true,
8983
port => 5672,
@@ -168,10 +162,7 @@ class { 'rabbitmq':
168162
context 'create binding and queue resources when using a non-default management port' do
169163
it 'runs successfully' do
170164
pp = <<-EOS
171-
if $facts['os']['family'] == 'RedHat' {
172-
class { 'erlang': epel_enable => true }
173-
Class['erlang'] -> Class['rabbitmq']
174-
}
165+
class { 'erlang': repo_source => 'packagecloud' } ->
175166
class { 'rabbitmq':
176167
service_manage => true,
177168
port => 5672,

‎spec/acceptance/rabbitmqadmin_spec.rb

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,11 @@
66
context 'downloads the cli tools' do
77
it 'runs successfully' do
88
pp = <<-EOS
9+
class { 'erlang': repo_source => 'packagecloud' } ->
910
class { 'rabbitmq':
1011
admin_enable => true,
1112
service_manage => true,
1213
}
13-
if $facts['os']['family'] == 'RedHat' {
14-
class { 'erlang': epel_enable => true}
15-
Class['erlang'] -> Class['rabbitmq']
16-
}
1714
EOS
1815

1916
apply_manifest(pp, catch_failures: true)
@@ -27,14 +24,11 @@ class { 'erlang': epel_enable => true}
2724
context 'does nothing if service is unmanaged' do
2825
it 'runs successfully' do
2926
pp = <<-EOS
27+
class { 'erlang': repo_source => 'packagecloud' } ->
3028
class { 'rabbitmq':
3129
admin_enable => true,
3230
service_manage => false,
3331
}
34-
if $facts['os']['family'] == 'RedHat' {
35-
class { 'erlang': epel_enable => true}
36-
Class['erlang'] -> Class['rabbitmq']
37-
}
3832
EOS
3933

4034
shell('rm -f /var/lib/rabbitmq/rabbitmqadmin')
@@ -50,28 +44,22 @@ class { 'erlang': epel_enable => true}
5044
it 'runs successfully' do
5145
# make sure credential change takes effect before admin_enable
5246
pp_pre = <<-EOS
47+
class { 'erlang': repo_source => 'packagecloud' } ->
5348
class { 'rabbitmq':
5449
service_manage => true,
5550
default_user => 'foobar',
5651
default_pass => 'bazblam',
5752
}
58-
if $facts['os']['family'] == 'RedHat' {
59-
class { 'erlang': epel_enable => true}
60-
Class['erlang'] -> Class['rabbitmq']
61-
}
6253
EOS
6354

6455
pp = <<-EOS
56+
class { 'erlang': repo_source => 'packagecloud' } ->
6557
class { 'rabbitmq':
6658
admin_enable => true,
6759
service_manage => true,
6860
default_user => 'foobar',
6961
default_pass => 'bazblam',
7062
}
71-
if $facts['os']['family'] == 'RedHat' {
72-
class { 'erlang': epel_enable => true}
73-
Class['erlang'] -> Class['rabbitmq']
74-
}
7563
EOS
7664

7765
shell('rm -f /var/lib/rabbitmq/rabbitmqadmin')

‎spec/acceptance/user_spec.rb

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@
66
context 'create user resource' do
77
it 'runs successfully' do
88
pp = <<-EOS
9-
if $facts['os']['family'] == 'RedHat' {
10-
class { 'erlang': epel_enable => true }
11-
Class['erlang'] -> Class['rabbitmq']
12-
}
9+
class { 'erlang': repo_source => 'packagecloud' } ->
1310
class { 'rabbitmq':
1411
service_manage => true,
1512
port => 5672,

‎spec/acceptance/vhost_spec.rb

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@
66
context 'create vhost resource' do
77
it 'runs successfully' do
88
pp = <<-EOS
9-
if $facts['os']['family'] == 'RedHat' {
10-
class { 'erlang': epel_enable => true }
11-
Class['erlang'] -> Class['rabbitmq']
12-
}
9+
class { 'erlang': repo_source => 'packagecloud' } ->
1310
class { 'rabbitmq':
1411
service_manage => true,
1512
port => 5672,

‎spec/spec_helper_acceptance.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
when 'Debian'
88
install_module_from_forge_on(host, 'puppetlabs-apt', '>= 4.1.0 < 9.0.0')
99
when 'RedHat'
10-
install_module_from_forge_on(host, 'garethr-erlang', '>= 0.3.0 < 1.0.0')
10+
install_module_from_forge_on(host, 'puppet-erlang', '>= 1.0.0 < 2.0.0')
1111
if fact_on(host, 'os.selinux.enabled')
1212
# Make sure selinux is disabled so the tests work.
1313
on host, puppet('resource', 'exec', 'setenforce 0', 'path=/bin:/sbin:/usr/bin:/usr/sbin', 'onlyif=which setenforce && getenforce | grep Enforcing')

0 commit comments

Comments
 (0)