X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/0fd66a3f0f75fd01d6d5a22570e9557158630e5a..2ff22e789a8bef70055e46992d215416bb08e01e:/.kitchen.yml

diff --git a/.kitchen.yml b/.kitchen.yml
index 418b11cf8..5795b9c7f 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -1,11 +1,18 @@
 ---
 driver:
   name: dokken
-  chef_version: 17
+  chef_version: 18
   volumes:
     - /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
@@ -14,19 +21,42 @@ provisioner:
   name: dokken
   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: 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
@@ -38,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]
@@ -89,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
@@ -104,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]
@@ -116,9 +147,24 @@ suites:
   - name: fail2ban
     run_list:
       - recipe[fail2ban::default]
-  - name: forum
+  - name: foundation-board
     run_list:
-      - recipe[forum::default]
+      - recipe[foundation::board]
+  - name: foundation-dwg
+    run_list:
+      - recipe[foundation::dwg]
+  - name: foundation-mwg
+    run_list:
+      - recipe[foundation::mwg]
+  - name: foundation-owg
+    run_list:
+      - recipe[foundation::owg]
+  - name: foundation-welcome
+    run_list:
+      - recipe[foundation::welcome]
+  - name: foundation-wiki
+    run_list:
+      - recipe[foundation::wiki]
   - name: ftp
     run_list:
       - recipe[ftp::default]
@@ -130,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]
@@ -152,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]
@@ -164,10 +212,6 @@ suites:
   - name: letsencrypt
     run_list:
       - recipe[letsencrypt::default]
-    attributes:
-      apt:
-        sources:
-          - openstreetmap
   - name: logstash
     run_list:
       - recipe[logstash::default]
@@ -254,6 +298,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]
@@ -278,7 +325,7 @@ suites:
     attributes:
       postgresql:
         versions:
-          - 10
+          - 15
   - name: prometheus
     run_list:
       - recipe[prometheus::default]
@@ -288,15 +335,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]
@@ -315,15 +360,9 @@ suites:
   - name: ssl
     run_list:
       - recipe[ssl::default]
-  - name: stateofthemap
-    run_list:
-      - recipe[stateofthemap::default]
-  - name: stateofthemap-static
+  - name: stateofthemap-container
     run_list:
-      - recipe[stateofthemap::static]
-  - name: stateofthemap-jekyll
-    run_list:
-      - recipe[stateofthemap::jekyll]
+      - recipe[stateofthemap::container]
   - name: stateofthemap-wordpress
     run_list:
       - recipe[stateofthemap::wordpress]
@@ -355,9 +394,6 @@ suites:
   - name: tilelog
     run_list:
       - recipe[tilelog::default]
-  - name: timescaledb
-    run_list:
-      - recipe[timescaledb::default]
   - name: tools
     run_list:
       - recipe[tools::default]