-
Notifications
You must be signed in to change notification settings - Fork 76
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #112 from myii/feat/add-debian-8_fix-issues_merge-…
…test-suites feat: merge test suites into single `default` suite
- Loading branch information
Showing
35 changed files
with
2,168 additions
and
146 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,113 @@ | ||
| # frozen_string_literal: true | ||
|
|
||
| # Prepare platform "finger" and base path to file comparison directory | ||
| platform_finger = "#{platform[:name]}-#{platform[:release].split('.')[0]}" | ||
| comparison_files_dir = '/tmp/kitchen/srv/salt/comparison_files' | ||
|
|
||
| # Default values for `control 'Tomcat main config'` | ||
| main_config_file = '/etc/sysconfig/tomcat' | ||
| # Default values for `control 'Tomcat Catalina temp dir'` | ||
| catalina_tmpdir = '/var/cache/tomcat/temp' | ||
| catalina_tmpdir_user_and_group = 'tomcat' | ||
| # Default values for `control 'Tomcat `server.xml` config'` | ||
| conf_dir = '/etc/tomcat' | ||
| server_xml_user_and_group = 'tomcat' | ||
|
|
||
| # Override by platform | ||
| case platform[:family] | ||
| when 'debian' | ||
| main_config_file = '/etc/default/tomcat8' | ||
| catalina_tmpdir = '/var/cache/tomcat8/temp' | ||
| catalina_tmpdir_user_and_group = 'tomcat8' | ||
| conf_dir = '/etc/tomcat8' | ||
| server_xml_user_and_group = 'tomcat8' | ||
| case platform_finger | ||
| when 'debian-10' | ||
| main_config_file = '/etc/default/tomcat9' | ||
| catalina_tmpdir = '/var/cache/tomcat9/temp' | ||
| catalina_tmpdir_user_and_group = 'tomcat' | ||
| conf_dir = '/etc/tomcat9' | ||
| server_xml_user_and_group = 'tomcat' | ||
| when 'debian-9' | ||
| when 'debian-8' | ||
| main_config_file = '/etc/default/tomcat7' | ||
| catalina_tmpdir = '/var/cache/tomcat7/temp' | ||
| catalina_tmpdir_user_and_group = 'tomcat7' | ||
| conf_dir = '/etc/tomcat7' | ||
| server_xml_user_and_group = 'tomcat7' | ||
| when 'ubuntu-18' | ||
| when 'ubuntu-16' | ||
| end | ||
| when 'redhat' | ||
| case platform_finger | ||
| when 'centos-8' | ||
| when 'centos-7' | ||
| when 'centos-6' | ||
| when 'amazon-2' | ||
| when 'amazon-2018' | ||
| end | ||
| when 'fedora' | ||
| case platform_finger | ||
| when 'fedora-31' | ||
| when 'fedora-30' | ||
| end | ||
| when 'suse' | ||
| case platform_finger | ||
| when 'opensuse-15' | ||
| server_xml_user_and_group = 'root' | ||
| end | ||
| when 'linux' | ||
| case platform_finger | ||
| when 'arch-5' | ||
| end | ||
| end | ||
|
|
||
| control 'Tomcat main config' do | ||
| title 'should contain the lines' | ||
|
|
||
| # Prepare comparison file | ||
| main_config_path = "#{comparison_files_dir}/main_config/#{platform_finger}" | ||
| main_config = file(main_config_path).content | ||
|
|
||
| describe file(main_config_file) do | ||
| it { should be_file } | ||
| it { should be_owned_by 'root' } | ||
| it { should be_grouped_into 'root' } | ||
| its('mode') { should cmp '0644' } | ||
| its('content') { should include main_config } | ||
| end | ||
| end | ||
|
|
||
| control 'Tomcat Catalina temp dir' do | ||
| title 'should be prepared with the settings' | ||
|
|
||
| describe file(catalina_tmpdir) do | ||
| it { should be_directory } | ||
| it { should be_owned_by catalina_tmpdir_user_and_group } | ||
| it { should be_grouped_into catalina_tmpdir_user_and_group } | ||
| its('mode') { should cmp '0755' } | ||
| end | ||
| end | ||
|
|
||
| control 'Tomcat `server.xml` config' do | ||
| title 'should contain the lines' | ||
|
|
||
| server_xml_file = "#{conf_dir}/server.xml" | ||
| server_xml_path = "#{comparison_files_dir}/server_xml/#{platform_finger}.xml" | ||
| server_xml = file(server_xml_path).content | ||
| # Need the hostname to be used for `tomcat.cluster` | ||
| server_xml = server_xml.gsub( | ||
| 'HOSTNAME_PLACEHOLDER', | ||
| file('/etc/hostname').content.chomp | ||
| ) | ||
|
|
||
| describe file(server_xml_file) do | ||
| it { should be_file } | ||
| it { should be_owned_by server_xml_user_and_group } | ||
| it { should be_grouped_into server_xml_user_and_group } | ||
| its('mode') { should cmp '0644' } | ||
| unless %w[debian-9].include?(platform_finger) | ||
| its('content') { should include server_xml } | ||
| end | ||
| end | ||
| end |
11 changes: 8 additions & 3 deletions
11
.../tomcat_install/controls/packages_spec.rb → ...gration/default/controls/packages_spec.rb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.