Rename .kitchen.travis.yml to .kitchen.dokken.ymltry_ec2

We're going to have more than 1 kitchen config now

Signed-off-by: Tim Smith <tsmith@chef.io>

3 files changed, 12 insertions, 47 deletions

diff --git a/.travis.yml b/.travis.yml
index 2911dcc70d..27694a60d4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -144,7 +144,7 @@ matrix:
       - cat .kitchen/logs/kitchen.log
     env:
       - AMAZON=LATEST
-      - KITCHEN_YAML=.kitchen.travis.yml
+      - KITCHEN_YAML=.kitchen.dokken.yml
   - rvm: 2.4.3
     services: docker
     sudo: required
@@ -161,7 +161,7 @@ matrix:
       - cat .kitchen/logs/kitchen.log
     env:
       - UBUNTU=14.04
-      - KITCHEN_YAML=.kitchen.travis.yml
+      - KITCHEN_YAML=.kitchen.dokken.yml
   - rvm: 2.4.3
     services: docker
     sudo: required
@@ -178,7 +178,7 @@ matrix:
       - cat .kitchen/logs/kitchen.log
     env:
       - UBUNTU=16.04
-      - KITCHEN_YAML=.kitchen.travis.yml
+      - KITCHEN_YAML=.kitchen.dokken.yml
   - rvm: 2.4.3
     services: docker
     sudo: required
@@ -195,7 +195,7 @@ matrix:
       - cat .kitchen/logs/kitchen.log
     env:
       - DEBIAN=7
-      - KITCHEN_YAML=.kitchen.travis.yml
+      - KITCHEN_YAML=.kitchen.dokken.yml
   - rvm: 2.4.3
     services: docker
     sudo: required
@@ -212,7 +212,7 @@ matrix:
       - cat .kitchen/logs/kitchen.log
     env:
       - DEBIAN=8
-      - KITCHEN_YAML=.kitchen.travis.yml
+      - KITCHEN_YAML=.kitchen.dokken.yml
   - rvm: 2.4.3
     services: docker
     sudo: required
@@ -229,7 +229,7 @@ matrix:
       - cat .kitchen/logs/kitchen.log
     env:
       - DEBIAN=9
-      - KITCHEN_YAML=.kitchen.travis.yml
+      - KITCHEN_YAML=.kitchen.dokken.yml
   - rvm: 2.4.3
     services: docker
     sudo: required
@@ -246,7 +246,7 @@ matrix:
       - cat .kitchen/logs/kitchen.log
     env:
       - CENTOS=6
-      - KITCHEN_YAML=.kitchen.travis.yml
+      - KITCHEN_YAML=.kitchen.dokken.yml
   - rvm: 2.4.3
     services: docker
     sudo: required
@@ -263,7 +263,7 @@ matrix:
       - cat .kitchen/logs/kitchen.log
     env:
       - CENTOS=7
-      - KITCHEN_YAML=.kitchen.travis.yml
+      - KITCHEN_YAML=.kitchen.dokken.yml
   - rvm: 2.4.3
     services: docker
     sudo: required
@@ -280,7 +280,7 @@ matrix:
      - cat .kitchen/logs/kitchen.log
     env:
      - FEDORA=latest
-     - KITCHEN_YAML=.kitchen.travis.yml
+     - KITCHEN_YAML=.kitchen.dokken.yml
   - rvm: 2.4.3
     services: docker
     sudo: required
@@ -297,42 +297,7 @@ matrix:
      - cat .kitchen/logs/kitchen.log
     env:
      - OPENSUSELEAP=42
-     - KITCHEN_YAML=.kitchen.travis.yml
-#  - rvm: 2.4.3
-#    services: docker
-#    sudo: required
-#    gemfile: kitchen-tests/Gemfile
-#    before_install:
-#      - gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2)
-#      - gem install bundler -v $(grep bundler omnibus_overrides.rb | cut -d'"' -f2)
-#    before_script:
-#      - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
-#      - cd kitchen-tests
-#    script:
-#      - bundle exec kitchen test awesome-customers-ubuntu-ubuntu-1404
-#    after_failure:
-#      - cat .kitchen/logs/kitchen.log
-#    env:
-#      - AWESOME_CUSTOMERS_UBUNTU=1
-#      - KITCHEN_YAML=.kitchen.travis.yml
-#  - rvm: 2.4.3
-#    services: docker
-#    sudo: required
-#    gemfile: kitchen-tests/Gemfile
-#    before_install:
-#      - gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2)
-#      - gem install bundler -v $(grep bundler omnibus_overrides.rb | cut -d'"' -f2)
-#    before_script:
-#      - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
-#      - cd kitchen-tests
-#    script:
-#      - bundle exec kitchen test awesome-customers-rhel-centos-7
-#    after_failure:
-#      - cat .kitchen/logs/kitchen.log
-#    env:
-#      - AWESOME_CUSTOMERS_RHEL=1
-#      - KITCHEN_YAML=.kitchen.travis.yml
-#    ### END TEST KITCHEN ONLY ###
+     - KITCHEN_YAML=.kitchen.dokken.yml
   - rvm: 2.5.0
     sudo: required
     before_install:
diff --git a/kitchen-tests/.kitchen.travis.yml b/kitchen-tests/.kitchen.dokken.yml
index a03aa68341..a03aa68341 100644
--- a/kitchen-tests/.kitchen.travis.yml
+++ b/kitchen-tests/.kitchen.dokken.yml
diff --git a/kitchen-tests/README.md b/kitchen-tests/README.md
index 2d03b19b62..c4be2fce4c 100644
--- a/kitchen-tests/README.md
+++ b/kitchen-tests/README.md
@@ -80,10 +80,10 @@ The branch you choose must be accessible on GitHub. You cannot use a local commi
 ### Testing pull requests
 These end-to-end tests are also configured to run with Travis on EC2 instances when you submit a pull request
 to `opscode/chef`. Kitchen is configured to pull chef client source code from the branch it is testing. There
-is no need to modify `.kitchen.travis.yml` unless you are contributing tests.
+is no need to modify `.kitchen.dokken.yml` unless you are contributing tests.
 
 ## Contributing
 We would love to fill out our end-to-end testing coverage! If you have cookbooks and tests that you would
 like to see become a part of client testing, we encourage you to submit a pull request with your additions.
-We request that you do not add platforms to `.kitchen.travis.yml`. Please file a request to add a
+We request that you do not add platforms to `.kitchen.dokken.yml`. Please file a request to add a
 platform under [Issues](https://github.com/opscode/chef/issues).