Skip to content

Commit

Permalink
test(yaml_dump_spec): update with common_pkg from PR #119 [skip ci]
Browse files Browse the repository at this point in the history
  • Loading branch information
myii committed Dec 15, 2020
1 parent 1d87d6c commit 29db014
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions test/integration/default/controls/yaml_dump_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
catalina_home = '/usr/share/tomcat9'
catalina_pid = '/var/run/tomcat9.pid'
catalina_tmpdir = '/var/cache/tomcat9/temp'
common_pkg = 'tomcat9-common'
when 'debian-9', 'ubuntu-18', 'ubuntu-16'
conf_dir = '/etc/tomcat8'
group = 'tomcat8'
Expand All @@ -37,6 +38,7 @@
catalina_home = '/usr/share/tomcat8'
catalina_pid = '/var/run/tomcat8.pid'
catalina_tmpdir = '/var/cache/tomcat8/temp'
common_pkg = 'tomcat8-common'
when 'debian-8'
conf_dir = '/etc/tomcat7'
group = 'tomcat7'
Expand All @@ -50,6 +52,7 @@
catalina_home = '/usr/share/tomcat7'
catalina_pid = '/var/run/tomcat7.pid'
catalina_tmpdir = '/var/cache/tomcat7/temp'
common_pkg = 'tomcat7-common'
end
<<~YAML_DUMP.chomp
arch: amd64
Expand All @@ -60,6 +63,7 @@
catalina_tmpdir: #{catalina_tmpdir}
cluster:
simple: true
common_pkg: #{common_pkg}
conf_dir: #{conf_dir}
connectors:
example_connector:
Expand Down Expand Up @@ -240,6 +244,7 @@
catalina_tmpdir: /var/cache/tomcat/temp
cluster:
simple: true
common_pkg: tomcat-common
conf_dir: /etc/tomcat
connectors:
example_connector:
Expand Down Expand Up @@ -414,6 +419,7 @@
catalina_tmpdir: /var/cache/tomcat/temp
cluster:
simple: true
common_pkg: tomcat-common
conf_dir: /etc/tomcat
connectors:
example_connector:
Expand Down

0 comments on commit 29db014

Please sign in to comment.