Skip to content

Commit a214c09

Browse files
florindragosflorindragos
authored
Merge pull request #1941 from sheenaajay/addredhat8
FM-8140 Add Redhat 8 support
2 parents cf6117b + cd81ee3 commit a214c09

13 files changed

+60
-31
lines changed

‎metadata.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323
"operatingsystemrelease": [
2424
"5",
2525
"6",
26-
"7"
26+
"7",
27+
"8"
2728
]
2829
},
2930
{

‎provision.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ travis_el7:
1010
images: ['waffleimage/centos7', 'waffleimage/oraclelinux7', 'waffleimage/scientificlinux7']
1111
release_checks:
1212
provisioner: vmpooler
13-
images: ['redhat-5-x86_64', 'redhat-6-x86_64', 'redhat-7-x86_64', 'centos-5-x86_64', 'centos-6-x86_64', 'centos-7-x86_64', 'oracle-6-x86_64', 'oracle-7-x86_64', 'scientific-6-x86_64', 'scientific-7-x86_64', 'debian-8-x86_64', 'debian-9-x86_64', 'ubuntu-1404-x86_64', 'ubuntu-1604-x86_64', 'ubuntu-1804-x86_64', 'sles-11-x86_64', 'sles-12-x86_64', 'sles-15-x86_64']
13+
images: ['redhat-5-x86_64', 'redhat-6-x86_64', 'redhat-7-x86_64', 'redhat-8-x86_64', 'centos-5-x86_64', 'centos-6-x86_64', 'centos-7-x86_64', 'oracle-6-x86_64', 'oracle-7-x86_64', 'scientific-6-x86_64', 'scientific-7-x86_64', 'debian-8-x86_64', 'debian-9-x86_64', 'ubuntu-1404-x86_64', 'ubuntu-1604-x86_64', 'ubuntu-1804-x86_64', 'sles-11-x86_64', 'sles-12-x86_64', 'sles-15-x86_64']

‎spec/acceptance/apache_parameters_spec.rb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class { 'apache':
5151
apply_manifest(pp, catch_failures: true)
5252
end
5353

54-
describe service(apache_hash['service_name']) do
54+
describe service(apache_hash['service_name']), skip: 'FM-8483' do
5555
it { is_expected.to be_running }
5656
it { is_expected.to be_enabled }
5757
end
@@ -68,7 +68,7 @@ class { 'apache':
6868
apply_manifest(pp, catch_failures: true)
6969
end
7070

71-
describe service(apache_hash['service_name']) do
71+
describe service(apache_hash['service_name']), skip: 'FM-8483' do
7272
it { is_expected.not_to be_running }
7373
it { is_expected.not_to be_enabled }
7474
end
@@ -86,7 +86,7 @@ class { 'apache':
8686
apply_manifest(pp, catch_failures: true)
8787
end
8888

89-
describe service(apache_hash['service_name']) do
89+
describe service(apache_hash['service_name']), skip: 'FM-8483' do
9090
it { is_expected.not_to be_running }
9191
it { is_expected.not_to be_enabled }
9292
end

‎spec/acceptance/class_spec.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
it { is_expected.to be_installed }
2727
end
2828

29-
describe service(apache_hash['service_name']) do
29+
describe service(apache_hash['service_name']), skip: 'FM-8483' do
3030
it { is_expected.to be_enabled }
3131
it { is_expected.to be_running }
3232
end
@@ -74,7 +74,7 @@ class { 'apache':
7474
idempotent_apply(pp)
7575
end
7676

77-
describe service(apache_hash['service_name']) do
77+
describe service(apache_hash['service_name']), skip: 'FM-8483' do
7878
it { is_expected.to be_enabled }
7979
it { is_expected.to be_running }
8080
end

‎spec/acceptance/default_mods_spec.rb‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class { 'apache':
1515
idempotent_apply(pp)
1616
end
1717

18-
describe service(apache_hash['service_name']) do
18+
describe service(apache_hash['service_name']), skip: 'FM-8483' do
1919
it { is_expected.to be_running }
2020
end
2121
end
@@ -54,7 +54,7 @@ class { 'apache':
5454
end
5555
end
5656

57-
describe service(apache_hash['service_name']) do
57+
describe service(apache_hash['service_name']), skip: 'FM-8483' do
5858
it { is_expected.not_to be_running }
5959
end
6060
end
@@ -87,7 +87,7 @@ class { 'apache':
8787
idempotent_apply(pp)
8888
end
8989

90-
describe service(apache_hash['service_name']) do
90+
describe service(apache_hash['service_name']), skip: 'FM-8483' do
9191
it { is_expected.to be_running }
9292
end
9393
end
@@ -106,7 +106,7 @@ class { 'apache': default_mods => false }
106106
idempotent_apply(pp)
107107
end
108108

109-
describe service(apache_hash['service_name']) do
109+
describe service(apache_hash['service_name']), skip: 'FM-8483' do
110110
it { is_expected.to be_running }
111111
end
112112

‎spec/acceptance/itk_spec.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class { 'apache':
3939
end
4040
end
4141

42-
describe service(service_name) do
42+
describe service(service_name), skip: 'FM-8483' do
4343
it { is_expected.to be_running }
4444
it { is_expected.to be_enabled }
4545
end

‎spec/acceptance/prefork_worker_spec.rb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class { 'apache':
1616
end
1717
end
1818

19-
describe service(apache_hash['service_name']) do
19+
describe service(apache_hash['service_name']), skip: 'FM-8483' do
2020
it { is_expected.to be_running }
2121
it { is_expected.to be_enabled }
2222
end
@@ -37,7 +37,7 @@ class { 'apache':
3737
end
3838
end
3939

40-
describe service(apache_hash['service_name']) do
40+
describe service(apache_hash['service_name']), skip: 'FM-8483' do
4141
it { is_expected.to be_running }
4242
it { is_expected.to be_enabled }
4343
end
@@ -59,7 +59,7 @@ class { 'apache':
5959
end
6060
end
6161

62-
describe service(apache_hash['service_name']) do
62+
describe service(apache_hash['service_name']), skip: 'FM-8483' do
6363
it { is_expected.to be_running }
6464
it { is_expected.to be_enabled }
6565
end

‎spec/acceptance/vhost_spec.rb‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ class { 'apache':
177177
apply_manifest(pp, catch_failures: true)
178178
end
179179

180-
describe service(apache_hash['service_name']) do
180+
describe service(apache_hash['service_name']), skip: 'FM-8483' do
181181
it { is_expected.to be_enabled }
182182
it { is_expected.to be_running }
183183
end
@@ -245,7 +245,7 @@ class { 'apache':
245245
apply_manifest(pp, catch_failures: true)
246246
end
247247

248-
describe service(apache_hash['service_name']) do
248+
describe service(apache_hash['service_name']), skip: 'FM-8483' do
249249
it { is_expected.to be_enabled }
250250
it { is_expected.to be_running }
251251
end
@@ -305,7 +305,7 @@ class { 'apache': }
305305
apply_manifest(pp, catch_failures: true)
306306
end
307307

308-
describe service(apache_hash['service_name']) do
308+
describe service(apache_hash['service_name']), skip: 'FM-8483' do
309309
it { is_expected.to be_enabled }
310310
it { is_expected.to be_running }
311311
end
@@ -367,7 +367,7 @@ class { 'apache': }
367367
apply_manifest(pp_one, catch_failures: true)
368368
end
369369

370-
describe service(apache_hash['service_name']) do
370+
describe service(apache_hash['service_name']), skip: 'FM-8483' do
371371
it { is_expected.to be_enabled }
372372
it { is_expected.to be_running }
373373
end
@@ -409,7 +409,7 @@ class { 'apache': }
409409
apply_manifest(pp_two, catch_failures: true)
410410
end
411411

412-
describe service(apache_hash['service_name']) do
412+
describe service(apache_hash['service_name']), skip: 'FM-8483' do
413413
it { is_expected.to be_enabled }
414414
it { is_expected.to be_running }
415415
end
@@ -485,7 +485,7 @@ class { 'apache': }
485485
apply_manifest(pp_two, catch_failures: true)
486486
end
487487

488-
describe service(apache_hash['service_name']) do
488+
describe service(apache_hash['service_name']), skip: 'FM-8483' do
489489
it { is_expected.to be_enabled }
490490
it { is_expected.to be_running }
491491

@@ -526,7 +526,7 @@ class { 'apache': }
526526
apply_manifest(pp, catch_failures: true)
527527
end
528528

529-
describe service(apache_hash['service_name']) do
529+
describe service(apache_hash['service_name']), skip: 'FM-8483' do
530530
it { is_expected.to be_enabled }
531531
it { is_expected.to be_running }
532532
end
@@ -572,7 +572,7 @@ class { 'apache': default_vhost => false, }
572572
), catch_failures: true)
573573
end
574574

575-
describe service(apache_hash['service_name']) do
575+
describe service(apache_hash['service_name']), skip: 'FM-8483' do
576576
it { is_expected.to be_enabled }
577577
it { is_expected.to be_running }
578578
end
@@ -617,7 +617,7 @@ class { 'apache': default_vhost => false, }
617617
), catch_failures: true)
618618
end
619619

620-
describe service(apache_hash['service_name']) do
620+
describe service(apache_hash['service_name']), skip: 'FM-8483' do
621621
it { is_expected.to be_enabled }
622622
it { is_expected.to be_running }
623623
end

‎spec/classes/mod/passenger_spec.rb‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -424,6 +424,16 @@
424424
is_expected.to contain_file('zpassenger.load').with('path' => '/etc/httpd/conf.modules.d/zpassenger.load')
425425
}
426426
end
427+
when '8'
428+
429+
context 'on EL8' do
430+
it {
431+
is_expected.to contain_file('passenger_package.conf').with('path' => '/etc/httpd/conf.d/passenger.conf')
432+
}
433+
it {
434+
is_expected.to contain_file('zpassenger.load').with('path' => '/etc/httpd/conf.d/zpassenger.load')
435+
}
436+
end
427437
end
428438
end
429439
when 'FreeBSD'

‎spec/classes/mod/security_spec.rb‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,20 @@
2424
)
2525
}
2626
it { is_expected.to contain_package('mod_security_crs') }
27-
if facts[:os]['release']['major'].to_i > 6
27+
if facts[:os]['release']['major'].to_i > 6 && facts[:os]['release']['major'].to_i <= 7
2828
it {
2929
is_expected.to contain_file('security.conf').with(
3030
path: '/etc/httpd/conf.modules.d/security.conf',
3131
)
3232
}
3333
end
34+
if facts[:os]['release']['major'].to_i >= 8
35+
it {
36+
is_expected.to contain_file('security.conf').with(
37+
path: '/etc/httpd/conf.d/security.conf',
38+
)
39+
}
40+
end
3441
it {
3542
is_expected.to contain_file('security.conf')
3643
.with_content(%r{^\s+SecAuditLogRelevantStatus "\^\(\?:5\|4\(\?!04\)\)"$})

0 commit comments

Comments
 (0)