Improve check for whether to run freshclam

[chef.git] / .kitchen.yml

diff --git a/.kitchen.yml b/.kitchen.yml
index 06c0da3bc93fca0eafe92aede869f68d499c7589..0f9e0f7a1d348f93de2e834b3a51daa3217960eb 100644 (file)
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -1,43 +1,34 @@
 ---
 driver:
 ---
 driver:

-  name: vagrant
-  provision: true
-  vagrantfiles:
-    - .kitchen.provision.rb
+  name: dokken
+  chef_version: 14
+
+transport:
+  name: dokken

 
 provisioner:
 
 provisioner:

-  name: chef_zero
-  product_name: chef
-  product_version: 14
+  name: dokken

   data_bags_path: test/data_bags
 
   data_bags_path: test/data_bags
 

+verifier:
+  root_path: /opt/verifier
+

 platforms:
   - name: ubuntu-18.04
 platforms:
   - name: ubuntu-18.04

-  - name: ubuntu-18.04-ci

     driver:
     driver:

-      name: dokken

       image: dokken/ubuntu-18.04
       image: dokken/ubuntu-18.04

-      chef_version: 14
-      provision: true
+      privileged: true

       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

-    provisioner:
-      name: dokken
-      product_name: chef
-      data_bags_path: test/data_bags
-    transport:
-      name: dokken

 
 suites:
   - name: accounts
     run_list:
       - recipe[accounts::default]
 
 suites:
   - name: accounts
     run_list:
       - recipe[accounts::default]

-    excludes: ["ubuntu-18.04-ci"]

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

-    excludes: ["ubuntu-18.04-ci"]

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


@@ -47,17 +38,20 @@ suites:
     attributes:
       bind:
         clients: none
     attributes:
       bind:
         clients: none

-    excludes: ["ubuntu-18.04-ci"]

   - name: blogs
     run_list:
       - recipe[accounts::default]
       - recipe[blogs::default]
   - name: blogs
     run_list:
       - recipe[accounts::default]
       - recipe[blogs::default]

-    excludes: ["ubuntu-18.04-ci"]
+  - name: clamav
+    run_list:
+      - recipe[clamav::default]
+  - name: exim
+    run_list:
+      - recipe[exim::default]

   - name: forum
     run_list:
       - recipe[accounts::default]
       - role[forum]
   - name: forum
     run_list:
       - recipe[accounts::default]
       - role[forum]

-    excludes: ["ubuntu-18.04-ci"]

   - name: letsencrypt
     run_list:
       - recipe[accounts::default]
   - name: letsencrypt
     run_list:
       - recipe[accounts::default]


@@ -67,34 +61,32 @@ suites:
       apt:
         sources:
           - openstreetmap
       apt:
         sources:
           - openstreetmap

-    excludes: ["ubuntu-18.04-ci"]

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

-    excludes: ["ubuntu-18.04-ci"]

   - name: munin-server
     run_list:
       - recipe[munin::server]
   - name: munin-server
     run_list:
       - recipe[munin::server]

-    excludes: ["ubuntu-18.04-ci"]

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

-    excludes: ["ubuntu-18.04-ci"]

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

-    excludes: ["ubuntu-18.04-ci"]
+  - name: ntp
+    run_list:
+      - recipe[ntp::default]

   - name: otrs
     run_list:
       - recipe[accounts::default]
       - recipe[chef::default]
       - role[otrs]
   - name: otrs
     run_list:
       - recipe[accounts::default]
       - recipe[chef::default]
       - role[otrs]

-    excludes: ["ubuntu-18.04-ci"]

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

-    excludes: ["ubuntu-18.04-ci"]
+  - name: spamassassin
+    run_list:
+      - recipe[spamassassin::default]

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

-    excludes: ["ubuntu-18.04-ci"]