kitchen: move chef_image into driver section

[chef.git] / .kitchen.yml

diff --git a/.kitchen.yml b/.kitchen.yml
index 5795b9c7fda8b38273c0f331c1302b603e94d5e9..88cfc7459f11ce9962864dc4aa0ead5574ed77ca 100644 (file)
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -1,7 +1,8 @@
 ---
 driver:
   name: dokken
-  chef_version: 18
+  chef_image: ghcr.io/firefishy/chef-docker-image
+  chef_version: latest
   volumes:
     - /var/lib/docker
   env:
@@ -9,9 +10,9 @@ driver:
   ipv6: true
   ipv6_subnet: "fd95:8552:964c::/64"
   dns:
-    - 1.1.1.1
     - 8.8.8.8
     - 8.8.4.4
+    - 1.1.1.1
     - 1.0.0.1
 
 transport:
@@ -23,6 +24,9 @@ provisioner:
   data_bags_path: test/data_bags
   slow_resource_report: true
   clean_dokken_sandbox: true
+  attributes:
+    networking:
+      dnssec: "false" # Disable DNSSEC as occasionally unreliable in GitHub Actions
 
 verifier:
   name: inspec
@@ -38,7 +42,7 @@ platforms:
       intermediate_instructions:
         - RUN /usr/bin/apt-get update -y
         - RUN /usr/bin/apt-get install -y eatmydata
-        - RUN echo libeatmydata.so >>/etc/ld.so.preload
+        - RUN echo /usr/lib/$(uname -m)-linux-gnu/libeatmydata.so >>/etc/ld.so.preload
   - name: ubuntu-22.04
     driver:
       image: ghcr.io/test-kitchen/dokken/ubuntu-22.04
@@ -47,7 +51,7 @@ platforms:
       intermediate_instructions:
         - RUN /usr/bin/apt-get update -y
         - RUN /usr/bin/apt-get install -y eatmydata
-        - RUN echo libeatmydata.so >>/etc/ld.so.preload
+        - RUN echo /usr/lib/$(uname -m)-linux-gnu/libeatmydata.so >>/etc/ld.so.preload
   - name: debian-12
     driver:
       image: ghcr.io/test-kitchen/dokken/debian-12
@@ -56,7 +60,7 @@ platforms:
       intermediate_instructions:
         - RUN /usr/bin/apt-get update -y
         - RUN /usr/bin/apt-get install -y eatmydata
-        - RUN echo libeatmydata.so >>/etc/ld.so.preload
+        - RUN echo /usr/lib/$(uname -m)-linux-gnu/libeatmydata.so >>/etc/ld.so.preload
 
 suites:
   - name: accounts
@@ -68,6 +72,9 @@ suites:
   - name: apt
     run_list:
       - recipe[apt::default]
+  - name: apt-repository
+    run_list:
+      - recipe[apt::repository]
   - name: awscli
     run_list:
       - recipe[awscli::default]
@@ -86,6 +93,9 @@ suites:
   - name: blogs
     run_list:
       - recipe[blogs::default]
+  - name: chef
+    run_list:
+      - recipe[chef::default]
   - name: civicrm
     run_list:
       - recipe[civicrm::default]
@@ -107,6 +117,13 @@ suites:
   - 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]
@@ -147,12 +164,18 @@ suites:
   - 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-dwg
     run_list:
       - recipe[foundation::dwg]
+  - name: foundation-mastodon
+    run_list:
+      - recipe[foundation::mastodon]
   - name: foundation-mwg
     run_list:
       - recipe[foundation::mwg]
@@ -203,6 +226,9 @@ suites:
   - name: ideditor
     run_list:
       - recipe[ideditor::default]
+  - name: imagery-tiler
+    run_list:
+      - recipe[imagery::tiler]
   - name: irc
     run_list:
       - recipe[irc::default]
@@ -241,15 +267,6 @@ suites:
   - name: memcached
     run_list:
       - recipe[memcached::default]
-  - name: munin
-    run_list:
-      - recipe[munin::default]
-  - name: munin-plugins
-    run_list:
-      - recipe[munin::plugins]
-  - name: munin-server
-    run_list:
-      - recipe[munin::server]
   - name: mysql
     run_list:
       - recipe[mysql::default]
@@ -400,6 +417,9 @@ suites:
   - name: trac
     run_list:
       - recipe[trac::default]
+  - name: vectortile
+    run_list:
+      - recipe[vectortile::default]
   - name: web-cgimap
     run_list:
       - recipe[web::cgimap]