From c1ec34776b1c1d5f1bb608e01a0fc8ed1c28175f Mon Sep 17 00:00:00 2001
From: Mikhail Zholobov <legal90@gmail.com>
Date: Wed, 11 Jan 2017 20:10:09 +0200
Subject: [PATCH 1/2] Avoid double testing in Travis

---
 .travis.yml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 46ad95a5..9f5ca3e4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,6 +31,9 @@ before_script:
   # https://github.com/zuazo/kitchen-in-travis-native/issues/1#issuecomment-142230889
   - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
   - eval "$(/opt/chefdk/bin/chef shell-init bash)"
+  - /opt/chefdk/embedded/bin/chef --version
+  - /opt/chefdk/embedded/bin/cookstyle --version
+  - /opt/chefdk/embedded/bin/foodcritic --version
 
 script: KITCHEN_LOCAL_YAML=.kitchen.dokken.yml kitchen verify ${INSTANCE}
 
@@ -41,11 +44,6 @@ after_script:
 
 matrix:
   include:
-    - before_script:
-      - eval "$(/opt/chefdk/bin/chef shell-init bash)"
-      - /opt/chefdk/embedded/bin/chef --version
-      - /opt/chefdk/embedded/bin/cookstyle --version
-      - /opt/chefdk/embedded/bin/foodcritic --version
     - script:
       - bundle install
       - bundle exec rake

From 855c980c85ee4159f8cb0ddbb613d83489b66240 Mon Sep 17 00:00:00 2001
From: Mikhail Zholobov <legal90@gmail.com>
Date: Wed, 11 Jan 2017 22:49:50 +0200
Subject: [PATCH 2/2] Remove "archive" suite from .kitchen.dokken.yml

The provider "binary" is used by default, so there is no distinct with the "default" suite here.
---
 .kitchen.dokken.yml | 8 --------
 .travis.yml         | 5 +----
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/.kitchen.dokken.yml b/.kitchen.dokken.yml
index 998b3096..4f9955d5 100644
--- a/.kitchen.dokken.yml
+++ b/.kitchen.dokken.yml
@@ -99,14 +99,6 @@ suites:
           server: true
           datacenter: FortMeade
           encrypt: CGXC2NsXW4AvuB4h5ODYzQ==
-  - name: archive
-    provisioner:
-      policyfile: test/fixtures/policies/default.rb
-    attributes:
-      consul:
-        provider: binary
-        options:
-          version: 0.7.1
   - name: webui
     provisioner:
       policyfile: test/fixtures/policies/default.rb
diff --git a/.travis.yml b/.travis.yml
index 9f5ca3e4..663eff8b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,10 +23,7 @@ env:
     - INSTANCE=default-ubuntu-1204
     - INSTANCE=default-debian-8
     - INSTANCE=default-debian-7
-    - INSTANCE=archive-centos-7
-    - INSTANCE=archive-centos-6
-    - INSTANCE=archive-ubuntu-1604
-    - INSTANCE=archive-ubuntu-1404
+
 before_script:
   # https://github.com/zuazo/kitchen-in-travis-native/issues/1#issuecomment-142230889
   - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )