Merge remote-tracking branch 'github/pull/467'

[chef.git] / .kitchen.yml

diff --git a/.kitchen.yml b/.kitchen.yml
index 58a63e3b9871a41e73e3890723c812dd084a1e1a..126f95338651efbe2333801835712e309b03deea 100644 (file)
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -1,7 +1,7 @@
 ---
 driver:
   name: dokken
 ---
 driver:
   name: dokken

-  chef_version: 16
+  chef_version: 17

   env:
     - container=dokken
 
   env:
     - container=dokken
 


@@ -18,13 +18,6 @@ verifier:
   sudo: false
 
 platforms:
   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
   - name: ubuntu-20.04
     driver:
       image: dokken/ubuntu-20.04


@@ -290,6 +283,9 @@ suites:
   - name: prometheus-server
     run_list:
       - recipe[prometheus::server]
   - name: prometheus-server
     run_list:
       - recipe[prometheus::server]

+    attributes:
+      prometheus:
+        promscale: true

   - name: python
     run_list:
       - recipe[python::default]
   - name: python
     run_list:
       - recipe[python::default]


@@ -305,9 +301,6 @@ suites:
   - name: spamassassin
     run_list:
       - recipe[spamassassin::default]
   - name: spamassassin
     run_list:
       - recipe[spamassassin::default]

-  - name: squid
-    run_list:
-      - recipe[squid::default]

   - name: ssl
     run_list:
       - recipe[ssl::default]
   - name: ssl
     run_list:
       - recipe[ssl::default]


@@ -339,9 +332,6 @@ suites:
   - name: tile
     run_list:
       - recipe[tile::default]
   - name: tile
     run_list:
       - recipe[tile::default]

-  - name: tilecache
-    run_list:
-      - recipe[tilecache::default]

   - name: tilelog
     run_list:
       - recipe[tilelog::default]
   - name: tilelog
     run_list:
       - recipe[tilelog::default]