Bump kitchen-dokken from 2.10.0 to 2.11.0

[chef.git] / .kitchen.yml

diff --git a/.kitchen.yml b/.kitchen.yml
index 1f71e92cd36109cc78ea7783062518d3281920b3..7c446effcc7dd0376579f18028160f24a2083474 100644 (file)
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -1,13 +1,16 @@
 ---
 driver:
   name: dokken
 ---
 driver:
   name: dokken

-  chef_version: 14
+  chef_version: 16
+  env:
+    - container=dokken

 
 transport:
   name: dokken
 
 provisioner:
   name: dokken
 
 transport:
   name: dokken
 
 provisioner:
   name: dokken

+  chef_license: accept

   data_bags_path: test/data_bags
 
 verifier:
   data_bags_path: test/data_bags
 
 verifier:


@@ -22,6 +25,13 @@ platforms:
       pid_one_command: /bin/systemd
       intermediate_instructions:
         - RUN /usr/bin/apt-get update -y
       pid_one_command: /bin/systemd
       intermediate_instructions:
         - RUN /usr/bin/apt-get update -y

+  - name: ubuntu-20.04
+    driver:
+      image: dokken/ubuntu-20.04
+      privileged: true
+      pid_one_command: /bin/systemd
+      intermediate_instructions:
+        - RUN /usr/bin/apt-get update -y

 
 suites:
   - name: accounts
 
 suites:
   - name: accounts


@@ -90,6 +100,12 @@ suites:
   - name: dmca
     run_list:
       - recipe[dmca::default]
   - name: dmca
     run_list:
       - recipe[dmca::default]

+  - name: dns
+    run_list:
+      - recipe[dns::default]
+  - name: docker
+    run_list:
+      - recipe[docker::default]

   - name: donate
     run_list:
       - recipe[donate::default]
   - name: donate
     run_list:
       - recipe[donate::default]


@@ -198,6 +214,9 @@ suites:
   - name: nodejs
     run_list:
       - recipe[nodejs::default]
   - name: nodejs
     run_list:
       - recipe[nodejs::default]

+  - name: nominatim
+    run_list:
+      - recipe[nominatim::default]

   - name: ntp
     run_list:
       - recipe[ntp::default]
   - name: ntp
     run_list:
       - recipe[ntp::default]


@@ -216,6 +235,15 @@ suites:
   - name: passenger
     run_list:
       - recipe[passenger::default]
   - name: passenger
     run_list:
       - recipe[passenger::default]

+  - name: php
+    run_list:
+      - recipe[php::default]
+  - name: php-apache
+    run_list:
+      - recipe[php::apache]
+  - name: php-fpm
+    run_list:
+      - recipe[php::fpm]

   - name: piwik
     run_list:
       - recipe[piwik::default]
   - name: piwik
     run_list:
       - recipe[piwik::default]


@@ -247,6 +275,12 @@ suites:
       postgresql:
         versions:
           - 10
       postgresql:
         versions:
           - 10

+  - name: prometheus
+    run_list:
+      - recipe[prometheus::default]
+  - name: prometheus-server
+    run_list:
+      - recipe[prometheus::server]

   - name: python
     run_list:
       - recipe[python::default]
   - name: python
     run_list:
       - recipe[python::default]


@@ -320,13 +354,9 @@ suites:
   - name: web-rails
     run_list:
       - recipe[web::rails]
   - name: web-rails
     run_list:
       - recipe[web::rails]

+  - name: wiki
+    run_list:
+      - recipe[wiki::default]

   - name: wordpress
     run_list:
       - recipe[wordpress::default]
   - name: wordpress
     run_list:
       - recipe[wordpress::default]

-  - name: wiki
-    run_list:
-      - recipe[apt::default]
-      - recipe[accounts::default]
-      - recipe[munin::default]
-      - recipe[wiki]
-      - role[wiki]