]> git.openstreetmap.org Git - chef.git/commitdiff
Add kitchen-dokken as a new provider in the kitchen configuration
authorJamie Alessio <jamie@stoic.net>
Sun, 9 Feb 2020 18:44:44 +0000 (18:44 +0000)
committerTom Hughes <tom@compton.nu>
Wed, 12 Feb 2020 23:00:50 +0000 (23:00 +0000)
.kitchen.yml
Gemfile
Gemfile.lock

index b78073bd53c5e194d135dedfedb9748c1d59444c..06c0da3bc93fca0eafe92aede869f68d499c7589 100644 (file)
@@ -13,14 +13,31 @@ provisioner:
 
 platforms:
   - name: ubuntu-18.04
+  - name: ubuntu-18.04-ci
+    driver:
+      name: dokken
+      image: dokken/ubuntu-18.04
+      chef_version: 14
+      provision: 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"]
   - name: apache
     run_list:
       - recipe[apache::default]
+    excludes: ["ubuntu-18.04-ci"]
   - name: apt
     run_list:
       - recipe[apt::default]
@@ -30,14 +47,17 @@ suites:
     attributes:
       bind:
         clients: none
+    excludes: ["ubuntu-18.04-ci"]
   - name: blogs
     run_list:
       - recipe[accounts::default]
       - recipe[blogs::default]
+    excludes: ["ubuntu-18.04-ci"]
   - name: forum
     run_list:
       - recipe[accounts::default]
       - role[forum]
+    excludes: ["ubuntu-18.04-ci"]
   - name: letsencrypt
     run_list:
       - recipe[accounts::default]
@@ -47,26 +67,34 @@ suites:
       apt:
         sources:
           - openstreetmap
+    excludes: ["ubuntu-18.04-ci"]
   - name: munin
     run_list:
       - recipe[munin::default]
+    excludes: ["ubuntu-18.04-ci"]
   - name: munin-server
     run_list:
       - recipe[munin::server]
+    excludes: ["ubuntu-18.04-ci"]
   - name: mysql
     run_list:
       - recipe[mysql::default]
+    excludes: ["ubuntu-18.04-ci"]
   - name: networking
     run_list:
       - recipe[networking::default]
+    excludes: ["ubuntu-18.04-ci"]
   - name: otrs
     run_list:
       - recipe[accounts::default]
       - recipe[chef::default]
       - role[otrs]
+    excludes: ["ubuntu-18.04-ci"]
   - name: python
     run_list:
       - recipe[python::default]
+    excludes: ["ubuntu-18.04-ci"]
   - name: tools
     run_list:
       - recipe[tools::default]
+    excludes: ["ubuntu-18.04-ci"]
diff --git a/Gemfile b/Gemfile
index ddf1c6b1cab9ab4372204993ddcb4570689bc5e1..270bcfaaa865e2d00cbc9d7f66d6ebf734c26929 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,7 @@
 source "https://rubygems.org"
 
 gem "cookstyle"
+gem "kitchen-dokken"
 gem "kitchen-vagrant"
 gem "serverspec"
 gem "test-kitchen"
index ca09b106eaa3a7cc9bd896afeac9cdd21bee9683..ea5cb74f0cd19cea498114e736fc5d4749536b02 100644 (file)
@@ -7,9 +7,13 @@ GEM
     cookstyle (5.19.9)
       rubocop (= 0.75.1)
     diff-lcs (1.3)
+    docker-api (1.34.2)
+      excon (>= 0.47.0)
+      multi_json
     ed25519 (1.2.4)
     equatable (0.6.1)
     erubi (1.9.0)
+    excon (0.72.0)
     ffi (1.12.1)
     gssapi (1.3.0)
       ffi (>= 1.0.1)
@@ -17,6 +21,10 @@ GEM
       builder (>= 2.1.2)
     httpclient (2.8.3)
     jaro_winkler (1.5.4)
+    kitchen-dokken (2.8.1)
+      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)
@@ -25,6 +33,7 @@ GEM
       tty-box (~> 0.3)
       tty-prompt (~> 0.18)
     little-plugger (1.1.4)
+    lockfile (2.1.3)
     logging (2.2.2)
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
@@ -149,6 +158,7 @@ PLATFORMS
 
 DEPENDENCIES
   cookstyle
+  kitchen-dokken
   kitchen-vagrant
   serverspec
   test-kitchen