X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/ab5e4c2b1326dc6deb059bc7e6ac39a5b4721ed1..e813380cea0d2d5b9c86e09cfd552ad58dbf341b:/.kitchen.yml

diff --git a/.kitchen.yml b/.kitchen.yml
index 3f54e1038..805d15b74 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -7,7 +7,12 @@ driver:
   env:
     - container=dokken
   ipv6: true
-  ipv6_subnet: "2001:db8:1::/64"
+  ipv6_subnet: "fd95:8552:964c::/64"
+  dns:
+    - 8.8.8.8
+    - 8.8.4.4
+    - 1.1.1.1
+    - 1.0.0.1
 
 transport:
   name: dokken
@@ -17,33 +22,44 @@ provisioner:
   chef_license: accept
   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
   root_path: /opt/verifier
   sudo: false
 
 platforms:
   - name: ubuntu-20.04
     driver:
-      image: dokken/ubuntu-20.04
+      image: ghcr.io/test-kitchen/dokken/ubuntu-20.04
       privileged: true
       pid_one_command: /bin/systemd
       intermediate_instructions:
         - RUN /usr/bin/apt-get update -y
+        - RUN /usr/bin/apt-get install -y eatmydata
+        - RUN echo /usr/lib/$(uname -m)-linux-gnu/libeatmydata.so >>/etc/ld.so.preload
   - name: ubuntu-22.04
     driver:
-      image: dokken/ubuntu-22.04
+      image: ghcr.io/test-kitchen/dokken/ubuntu-22.04
       privileged: true
       pid_one_command: /bin/systemd
       intermediate_instructions:
         - RUN /usr/bin/apt-get update -y
-  - name: debian-11
+        - RUN /usr/bin/apt-get install -y eatmydata
+        - RUN echo /usr/lib/$(uname -m)-linux-gnu/libeatmydata.so >>/etc/ld.so.preload
+  - name: debian-12
     driver:
-      image: dokken/debian-11
+      image: ghcr.io/test-kitchen/dokken/debian-12
       privileged: true
       pid_one_command: /bin/systemd
       intermediate_instructions:
         - RUN /usr/bin/apt-get update -y
+        - RUN /usr/bin/apt-get install -y eatmydata
+        - RUN echo /usr/lib/$(uname -m)-linux-gnu/libeatmydata.so >>/etc/ld.so.preload
 
 suites:
   - name: accounts
@@ -55,6 +71,12 @@ suites:
   - name: apt
     run_list:
       - recipe[apt::default]
+  - name: apt-repository
+    run_list:
+      - recipe[apt::repository]
+  - name: awscli
+    run_list:
+      - recipe[awscli::default]
   - name: backup
     run_list:
       - recipe[backup::default]
@@ -70,6 +92,9 @@ suites:
   - name: blogs
     run_list:
       - recipe[blogs::default]
+  - name: chef
+    run_list:
+      - recipe[chef::default]
   - name: civicrm
     run_list:
       - recipe[civicrm::default]
@@ -91,6 +116,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]
@@ -122,9 +154,6 @@ suites:
   - name: docker
     run_list:
       - recipe[docker::default]
-  - name: donate
-    run_list:
-      - recipe[donate::default]
   - name: elasticsearch
     run_list:
       - recipe[elasticsearch::default]
@@ -140,6 +169,9 @@ suites:
   - name: foundation-dwg
     run_list:
       - recipe[foundation::dwg]
+  - name: foundation-mastodon
+    run_list:
+      - recipe[foundation::mastodon]
   - name: foundation-mwg
     run_list:
       - recipe[foundation::mwg]
@@ -190,6 +222,9 @@ suites:
   - name: ideditor
     run_list:
       - recipe[ideditor::default]
+  - name: imagery-tiler
+    run_list:
+      - recipe[imagery::tiler]
   - name: irc
     run_list:
       - recipe[irc::default]
@@ -228,15 +263,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]
@@ -285,6 +311,9 @@ suites:
   - name: planet
     run_list:
       - recipe[planet::default]
+  - name: planet-aws
+    run_list:
+      - recipe[planet::aws]
   - name: planet-current
     run_list:
       - recipe[planet::current]