X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/207dca167b6211116a0af448aff9907f3e3ab4bd..6b1cb7b0c7254a87f78ad367a190f05788c2f488:/.kitchen.yml?ds=sidebyside

diff --git a/.kitchen.yml b/.kitchen.yml
index 58a63e3b9..126f95338 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -1,7 +1,7 @@
 ---
 driver:
   name: dokken
-  chef_version: 16
+  chef_version: 17
   env:
     - container=dokken
 
@@ -18,13 +18,6 @@ verifier:
   sudo: false
 
 platforms:
-  - name: ubuntu-18.04
-    driver:
-      image: dokken/ubuntu-18.04
-      privileged: true
-      pid_one_command: /bin/systemd
-      intermediate_instructions:
-        - RUN /usr/bin/apt-get update -y
   - name: ubuntu-20.04
     driver:
       image: dokken/ubuntu-20.04
@@ -290,6 +283,9 @@ suites:
   - name: prometheus-server
     run_list:
       - recipe[prometheus::server]
+    attributes:
+      prometheus:
+        promscale: true
   - name: python
     run_list:
       - recipe[python::default]
@@ -305,9 +301,6 @@ suites:
   - name: spamassassin
     run_list:
       - recipe[spamassassin::default]
-  - name: squid
-    run_list:
-      - recipe[squid::default]
   - name: ssl
     run_list:
       - recipe[ssl::default]
@@ -339,9 +332,6 @@ suites:
   - name: tile
     run_list:
       - recipe[tile::default]
-  - name: tilecache
-    run_list:
-      - recipe[tilecache::default]
   - name: tilelog
     run_list:
       - recipe[tilelog::default]