summaryrefslogtreecommitdiff
path: root/kitchen-tests
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2014-10-28 19:12:13 -0700
committerLamont Granquist <lamont@scriptkiddie.org>2014-10-28 19:15:11 -0700
commitfddec00efe721e68fb1f2ba0440f93e496ce145c (patch)
treeb51df507802bc9966e17455306a2219af0ccfcdb /kitchen-tests
parent999e24cff0144bcc135e4282ea63fa2143fc11ef (diff)
downloadchef-fddec00efe721e68fb1f2ba0440f93e496ce145c.tar.gz
add 14.04 to supported vagrant distroslcg/more-vagrant
10.04 and 14.10 'documented' as broken in the upstream mysql cookbook
Diffstat (limited to 'kitchen-tests')
-rw-r--r--kitchen-tests/.kitchen.yml14
-rw-r--r--kitchen-tests/cookbooks/webapp/attributes/default.rb11
-rw-r--r--kitchen-tests/test/fixtures/platforms/ubuntu/10.04.json14
-rw-r--r--kitchen-tests/test/fixtures/platforms/ubuntu/14.04.json14
-rw-r--r--kitchen-tests/test/fixtures/platforms/ubuntu/14.10.json14
5 files changed, 61 insertions, 6 deletions
diff --git a/kitchen-tests/.kitchen.yml b/kitchen-tests/.kitchen.yml
index 5a93822b5d..775bb59378 100644
--- a/kitchen-tests/.kitchen.yml
+++ b/kitchen-tests/.kitchen.yml
@@ -11,14 +11,20 @@ provisioner:
branch: <%= %x(git rev-parse HEAD) %>
require_chef_omnibus: true
data_path: test/fixtures
+ client_rb:
+ diff_disabled: true
platforms:
-# - name: ubuntu-10.04
-# run_list: apt::default
+ # upstream community mysql cookbook broken on 10.04
+ #- name: ubuntu-10.04
+ # run_list: apt::default
- name: ubuntu-12.04
run_list: apt::default
-# - name: ubuntu-13.04
-# run_list: apt::default
+ - name: ubuntu-14.04
+ run_list: apt::default
+ # upstream community mysql cookbook also broken on 14.10
+ #- name: ubuntu-14.10
+ # run_list: apt::default
- name: centos-6.4
run_list: yum-epel::default
- name: centos-5.10
diff --git a/kitchen-tests/cookbooks/webapp/attributes/default.rb b/kitchen-tests/cookbooks/webapp/attributes/default.rb
index 76c300211f..fb33efa49e 100644
--- a/kitchen-tests/cookbooks/webapp/attributes/default.rb
+++ b/kitchen-tests/cookbooks/webapp/attributes/default.rb
@@ -1,7 +1,14 @@
default['apache']['remote_host_ip'] = '127.0.0.1'
-default['mysql']['version'] = "5.5"
-
default['webapp']['database'] = 'webapp'
default['webapp']['db_username'] = 'webapp'
default['webapp']['path'] = '/srv/webapp'
+
+# XXX: apache2 cookbook 2.0.0 has bugs around changing the mpm and then attempting a graceful restart
+# which fails and leaves the service down.
+case node['platform']
+when "ubuntu"
+ if node['platform_version'].to_f >= 14.04
+ default[:apache][:mpm] = 'event'
+ end
+end
diff --git a/kitchen-tests/test/fixtures/platforms/ubuntu/10.04.json b/kitchen-tests/test/fixtures/platforms/ubuntu/10.04.json
new file mode 100644
index 0000000000..a9677c7ca5
--- /dev/null
+++ b/kitchen-tests/test/fixtures/platforms/ubuntu/10.04.json
@@ -0,0 +1,14 @@
+{
+ "apache": {
+ "package": "apache2",
+ "service_name": "apache2"
+ },
+ "mysql": {
+ "server_package": "mysql-server-5.1",
+ "client_package": "mysql-client-5.1",
+ "service_name": "mysql"
+ },
+ "php" : {
+ "package": "php5"
+ }
+}
diff --git a/kitchen-tests/test/fixtures/platforms/ubuntu/14.04.json b/kitchen-tests/test/fixtures/platforms/ubuntu/14.04.json
new file mode 100644
index 0000000000..eab46db2e5
--- /dev/null
+++ b/kitchen-tests/test/fixtures/platforms/ubuntu/14.04.json
@@ -0,0 +1,14 @@
+{
+ "apache": {
+ "package": "apache2",
+ "service_name": "apache2"
+ },
+ "mysql": {
+ "server_package": "mysql-server-5.5",
+ "client_package": "mysql-client-5.5",
+ "service_name": "mysql"
+ },
+ "php" : {
+ "package": "php5"
+ }
+}
diff --git a/kitchen-tests/test/fixtures/platforms/ubuntu/14.10.json b/kitchen-tests/test/fixtures/platforms/ubuntu/14.10.json
new file mode 100644
index 0000000000..eab46db2e5
--- /dev/null
+++ b/kitchen-tests/test/fixtures/platforms/ubuntu/14.10.json
@@ -0,0 +1,14 @@
+{
+ "apache": {
+ "package": "apache2",
+ "service_name": "apache2"
+ },
+ "mysql": {
+ "server_package": "mysql-server-5.5",
+ "client_package": "mysql-client-5.5",
+ "service_name": "mysql"
+ },
+ "php" : {
+ "package": "php5"
+ }
+}