kitchen: move chef_image into driver section

[chef.git] / .kitchen.yml

diff --git a/.kitchen.yml b/.kitchen.yml
index f439c27944ddc46e6fda45b31f64d7ad58102aa7..88cfc7459f11ce9962864dc4aa0ead5574ed77ca 100644 (file)
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -1,7 +1,8 @@
 ---
 driver:
   name: dokken
 ---
 driver:
   name: dokken

-  chef_version: 18
+  chef_image: ghcr.io/firefishy/chef-docker-image
+  chef_version: latest

   volumes:
     - /var/lib/docker
   env:
   volumes:
     - /var/lib/docker
   env:


@@ -71,6 +72,9 @@ suites:
   - name: apt
     run_list:
       - recipe[apt::default]
   - name: apt
     run_list:
       - recipe[apt::default]

+  - name: apt-repository
+    run_list:
+      - recipe[apt::repository]

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


@@ -113,6 +117,13 @@ suites:
   - name: db-slave
     run_list:
       - recipe[db::slave]
   - name: db-slave
     run_list:
       - recipe[db::slave]

+  - name: dev
+    run_list:
+      - recipe[dev::default]
+    attributes:
+      postgresql:
+        versions:
+          - 15

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


@@ -153,6 +164,9 @@ suites:
   - name: fail2ban
     run_list:
       - recipe[fail2ban::default]
   - name: fail2ban
     run_list:
       - recipe[fail2ban::default]

+  - name: foundation-birthday
+    run_list:
+      - recipe[foundation::birthday]

   - name: foundation-board
     run_list:
       - recipe[foundation::board]
   - name: foundation-board
     run_list:
       - recipe[foundation::board]


@@ -283,9 +297,6 @@ suites:
   - name: otrs
     run_list:
       - recipe[otrs::default]
   - name: otrs
     run_list:
       - recipe[otrs::default]

-  - name: otrs-debian
-    run_list:
-      - recipe[otrs::debian]

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


@@ -406,6 +417,9 @@ suites:
   - name: trac
     run_list:
       - recipe[trac::default]
   - name: trac
     run_list:
       - recipe[trac::default]

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

   - name: web-cgimap
     run_list:
       - recipe[web::cgimap]
   - name: web-cgimap
     run_list:
       - recipe[web::cgimap]