From: Tom Hughes <tom@compton.nu>
Date: Wed, 12 Feb 2020 23:04:21 +0000 (+0000)
Subject: Drop kitchen-vagrant and make kitchen-dokken the only test driver
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/31dbdb209bdb7c7fcf978b5a6e234ed0e46a4146?ds=sidebyside

Drop kitchen-vagrant and make kitchen-dokken the only test driver
---

diff --git a/.kitchen.yml b/.kitchen.yml
index 06c0da3bc..e060fe1b6 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -1,43 +1,36 @@
 ---
 driver:
-  name: vagrant
-  provision: true
-  vagrantfiles:
-    - .kitchen.provision.rb
+  name: dokken
+  chef_version: 14
+
+transport:
+  name: dokken
 
 provisioner:
-  name: chef_zero
-  product_name: chef
-  product_version: 14
+  name: dokken
   data_bags_path: test/data_bags
 
+verifier:
+  root_path: /opt/verifier
+
 platforms:
   - name: ubuntu-18.04
-  - name: ubuntu-18.04-ci
     driver:
-      name: dokken
       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
-    provisioner:
-      name: dokken
-      product_name: chef
-      data_bags_path: test/data_bags
-    transport:
-      name: dokken
 
 suites:
   - name: accounts
     run_list:
       - recipe[accounts::default]
-    excludes: ["ubuntu-18.04-ci"]
+    excludes: ["ubuntu-18.04"]
   - name: apache
     run_list:
       - recipe[apache::default]
-    excludes: ["ubuntu-18.04-ci"]
+    excludes: ["ubuntu-18.04"]
   - name: apt
     run_list:
       - recipe[apt::default]
@@ -47,17 +40,17 @@ suites:
     attributes:
       bind:
         clients: none
-    excludes: ["ubuntu-18.04-ci"]
+    excludes: ["ubuntu-18.04"]
   - name: blogs
     run_list:
       - recipe[accounts::default]
       - recipe[blogs::default]
-    excludes: ["ubuntu-18.04-ci"]
+    excludes: ["ubuntu-18.04"]
   - name: forum
     run_list:
       - recipe[accounts::default]
       - role[forum]
-    excludes: ["ubuntu-18.04-ci"]
+    excludes: ["ubuntu-18.04"]
   - name: letsencrypt
     run_list:
       - recipe[accounts::default]
@@ -67,34 +60,34 @@ suites:
       apt:
         sources:
           - openstreetmap
-    excludes: ["ubuntu-18.04-ci"]
+    excludes: ["ubuntu-18.04"]
   - name: munin
     run_list:
       - recipe[munin::default]
-    excludes: ["ubuntu-18.04-ci"]
+    excludes: ["ubuntu-18.04"]
   - name: munin-server
     run_list:
       - recipe[munin::server]
-    excludes: ["ubuntu-18.04-ci"]
+    excludes: ["ubuntu-18.04"]
   - name: mysql
     run_list:
       - recipe[mysql::default]
-    excludes: ["ubuntu-18.04-ci"]
+    excludes: ["ubuntu-18.04"]
   - name: networking
     run_list:
       - recipe[networking::default]
-    excludes: ["ubuntu-18.04-ci"]
+    excludes: ["ubuntu-18.04"]
   - name: otrs
     run_list:
       - recipe[accounts::default]
       - recipe[chef::default]
       - role[otrs]
-    excludes: ["ubuntu-18.04-ci"]
+    excludes: ["ubuntu-18.04"]
   - name: python
     run_list:
       - recipe[python::default]
-    excludes: ["ubuntu-18.04-ci"]
+    excludes: ["ubuntu-18.04"]
   - name: tools
     run_list:
       - recipe[tools::default]
-    excludes: ["ubuntu-18.04-ci"]
+    excludes: ["ubuntu-18.04"]
diff --git a/.travis.yml b/.travis.yml
index 631b5775d..a0d25a1b7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,12 +3,6 @@ language: ruby
 cache: bundler
 services:
   - docker
-before_script:
-  # Put just enough Vagrant in the PATH to satisfy Test-Kitchen. No actual
-  # Vagrant or Virtualbox is run on Travis; this fake shim that echoes a
-  # recent Vagrant version is only here to allow tests to proceed below.
-  - sudo bash -c 'echo "echo Vagrant 2.0.0-fake" > /usr/bin/vagrant'
-  - sudo chmod +x /usr/bin/vagrant
 jobs:
   include:
     - name: "Cookstyle"
@@ -16,4 +10,4 @@ jobs:
       - bundle exec cookstyle -f fuubar
     - name: "Kitchen Test Apt Cookbook"
       script:
-      - bundle exec kitchen test apt-ubuntu-1804-ci
+      - bundle exec kitchen test apt-ubuntu-1804
diff --git a/Gemfile b/Gemfile
index 270bcfaaa..f04be603c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,6 +2,5 @@ source "https://rubygems.org"
 
 gem "cookstyle"
 gem "kitchen-dokken"
-gem "kitchen-vagrant"
 gem "serverspec"
 gem "test-kitchen"
diff --git a/Gemfile.lock b/Gemfile.lock
index ea5cb74f0..4d0fa2e2f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -25,8 +25,6 @@ GEM
       docker-api (~> 1.33)
       lockfile (~> 2.1)
       test-kitchen (>= 1.15, < 3)
-    kitchen-vagrant (1.6.1)
-      test-kitchen (>= 1.4, < 3)
     license-acceptance (1.0.13)
       pastel (~> 0.7)
       tomlrb (~> 1.2)
@@ -159,7 +157,6 @@ PLATFORMS
 DEPENDENCIES
   cookstyle
   kitchen-dokken
-  kitchen-vagrant
   serverspec
   test-kitchen