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

[chef.git] / .kitchen.yml

diff --git a/.kitchen.yml b/.kitchen.yml
index 133d124eea8396df116445f4467ca86f5aa1fbb0..854666cc6f144da828f0d82d36baea55a82d5ead 100644 (file)
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -1,7 +1,7 @@
 ---
 driver:
   name: dokken
 ---
 driver:
   name: dokken

-  chef_version: 15
+  chef_version: 16

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


@@ -25,6 +25,13 @@ platforms:
       pid_one_command: /bin/systemd
       intermediate_instructions:
         - RUN /usr/bin/apt-get update -y
       pid_one_command: /bin/systemd
       intermediate_instructions:
         - RUN /usr/bin/apt-get update -y

+  - name: ubuntu-20.04
+    driver:
+      image: dokken/ubuntu-20.04
+      privileged: true
+      pid_one_command: /bin/systemd
+      intermediate_instructions:
+        - RUN /usr/bin/apt-get update -y

 
 suites:
   - name: accounts
 
 suites:
   - name: accounts


@@ -93,6 +100,9 @@ suites:
   - name: dmca
     run_list:
       - recipe[dmca::default]
   - name: dmca
     run_list:
       - recipe[dmca::default]

+  - name: dns
+    run_list:
+      - recipe[dns::default]

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


@@ -265,6 +275,21 @@ suites:
       postgresql:
         versions:
           - 10
       postgresql:
         versions:
           - 10

+  - name: prometheus
+    run_list:
+      - recipe[prometheus::default]
+    attributes:
+      networking:
+        interfaces:
+          test:
+            interface: eth0
+            role: internal
+            address: 172.18.0.2
+            prefix: 16
+            gateway: 172.18.0.1
+  - name: prometheus-server
+    run_list:
+      - recipe[prometheus::server]

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