X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/eb10ee11cf967f641485a4124c337f52ce6b9939..94d26efb2d2fc50d3b30b5b4ec9f5546d52d748b:/.kitchen.yml

diff --git a/.kitchen.yml b/.kitchen.yml
index 2e7ae9638..3d9674533 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -6,6 +6,13 @@ driver:
     - /var/lib/docker
   env:
     - container=dokken
+  ipv6: true
+  ipv6_subnet: "fd95:8552:964c::/64"
+  dns:
+    - 1.1.1.1
+    - 8.8.8.8
+    - 8.8.4.4
+    - 1.0.0.1
 
 transport:
   name: dokken
@@ -15,26 +22,41 @@ provisioner:
   chef_license: accept
   data_bags_path: test/data_bags
   slow_resource_report: true
+  clean_dokken_sandbox: true
 
 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 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
+        - RUN /usr/bin/apt-get install -y eatmydata
+        - RUN echo libeatmydata.so >>/etc/ld.so.preload
+  - name: debian-12
+    driver:
+      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 libeatmydata.so >>/etc/ld.so.preload
 
 suites:
   - name: accounts
@@ -46,6 +68,9 @@ suites:
   - name: apt
     run_list:
       - recipe[apt::default]
+  - name: awscli
+    run_list:
+      - recipe[awscli::default]
   - name: backup
     run_list:
       - recipe[backup::default]
@@ -97,9 +122,10 @@ suites:
           test:
             interface: eth0
             role: internal
-            address: 172.18.0.2
-            prefix: 16
-            gateway: 172.18.0.1
+            inet:
+              address: 172.18.0.2
+              prefix: 16
+              gateway: 172.18.0.1
         roles:
           external:
             zone: test
@@ -112,9 +138,6 @@ suites:
   - name: docker
     run_list:
       - recipe[docker::default]
-  - name: donate
-    run_list:
-      - recipe[donate::default]
   - name: elasticsearch
     run_list:
       - recipe[elasticsearch::default]
@@ -124,9 +147,6 @@ suites:
   - name: fail2ban
     run_list:
       - recipe[fail2ban::default]
-  - name: forum
-    run_list:
-      - recipe[forum::default]
   - name: foundation-board
     run_list:
       - recipe[foundation::board]
@@ -156,7 +176,9 @@ suites:
         interfaces:
           test:
             role: external
-            address: 172.18.0.2
+            inet:
+              address: 172.18.0.2
+              prefix: 16
   - name: geoipupdate
     run_list:
       - recipe[geoipupdate::default]
@@ -178,9 +200,9 @@ suites:
   - name: hot
     run_list:
       - recipe[hot::default]
-  - name: incron
+  - name: ideditor
     run_list:
-      - recipe[incron::default]
+      - recipe[ideditor::default]
   - name: irc
     run_list:
       - recipe[irc::default]
@@ -310,15 +332,13 @@ suites:
           test:
             interface: eth0
             role: internal
-            address: 172.18.0.2
-            prefix: 16
-            gateway: 172.18.0.1
+            inet:
+              address: 172.18.0.2
+              prefix: 16
+              gateway: 172.18.0.1
   - name: prometheus-server
     run_list:
       - recipe[prometheus::server]
-    attributes:
-      prometheus:
-        promscale: true
   - name: python
     run_list:
       - recipe[python::default]
@@ -337,15 +357,9 @@ suites:
   - name: ssl
     run_list:
       - recipe[ssl::default]
-  - name: stateofthemap
+  - name: stateofthemap-container
     run_list:
-      - recipe[stateofthemap::default]
-  - name: stateofthemap-static
-    run_list:
-      - recipe[stateofthemap::static]
-  - name: stateofthemap-jekyll
-    run_list:
-      - recipe[stateofthemap::jekyll]
+      - recipe[stateofthemap::container]
   - name: stateofthemap-wordpress
     run_list:
       - recipe[stateofthemap::wordpress]
@@ -377,9 +391,6 @@ suites:
   - name: tilelog
     run_list:
       - recipe[tilelog::default]
-  - name: timescaledb
-    run_list:
-      - recipe[timescaledb::default]
   - name: tools
     run_list:
       - recipe[tools::default]