diff --git a/test/integration/tomcat_install/controls/yaml_dump_spec.rb b/test/integration/tomcat_install/controls/yaml_dump_spec.rb index 477fff9bbd810efcc4ca950a0ac3ef5d7e19d32f..aeba17d4bdb4988048aad1db020ccdaba4283cbf 100644 --- a/test/integration/tomcat_install/controls/yaml_dump_spec.rb +++ b/test/integration/tomcat_install/controls/yaml_dump_spec.rb @@ -209,6 +209,12 @@ control 'Tomcat `map.jinja` YAML dump' do with_haveged: true YAML_DUMP when 'redhat', 'fedora' + case platform[:family] + when 'redhat' + ver = 7 + when 'fedora' + ver = 9 + end <<~YAML_DUMP.chomp arch: amd64 authbind: 'no' @@ -379,7 +385,7 @@ control 'Tomcat `map.jinja` YAML dump' do "%{User-Agent}i" %D' - className: org.apache.catalina.authenticator.SingleSignOn user: tomcat - ver: 7 + ver: #{ver} with_haveged: false YAML_DUMP when 'suse' diff --git a/tomcat/osmap.yaml b/tomcat/osmap.yaml index de11a67327c8df5c87f623d5f594bfd8ea414ed4..a9a506e9d15fbea635bb07618b6a250c4e3fc082 100644 --- a/tomcat/osmap.yaml +++ b/tomcat/osmap.yaml @@ -15,7 +15,8 @@ Ubuntu: {} Raspbian: {} # os_family: RedHat -Fedora: {} +Fedora: + ver: 9 CentOS: {} Amazon: {}