Rename the kitchen base test suite to end-to-endkitchen_test_rename

It's our end-to-end test according to the readme. This just aligns the recipe/suite names with that so it's a bit more obvious what we're doing here. This also removes sudo installs since I moved that all to dokken-images now.

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

13 files changed, 32 insertions, 37 deletions

diff --git a/.travis.yml b/.travis.yml
index 84d8c71543..40b2e7ddef 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -127,7 +127,7 @@ matrix:
       - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
       - cd kitchen-tests
     script:
-      - bundle exec kitchen test base-amazonlinux-2
+      - bundle exec kitchen test end-to-end-amazonlinux-2
     after_failure:
       - cat .kitchen/logs/kitchen.log
     env:
@@ -144,7 +144,7 @@ matrix:
       - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
       - cd kitchen-tests
     script:
-      - bundle exec kitchen test base-amazonlinux
+      - bundle exec kitchen test end-to-end-amazonlinux
     after_failure:
       - cat .kitchen/logs/kitchen.log
     env:
@@ -161,7 +161,7 @@ matrix:
       - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
       - cd kitchen-tests
     script:
-      - bundle exec kitchen test base-ubuntu-1404
+      - bundle exec kitchen test end-to-end-ubuntu-1404
     after_failure:
       - cat .kitchen/logs/kitchen.log
     env:
@@ -178,7 +178,7 @@ matrix:
       - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
       - cd kitchen-tests
     script:
-      - bundle exec kitchen test base-ubuntu-1604
+      - bundle exec kitchen test end-to-end-ubuntu-1604
     after_failure:
       - cat .kitchen/logs/kitchen.log
     env:
@@ -195,7 +195,7 @@ matrix:
       - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
       - cd kitchen-tests
     script:
-      - bundle exec kitchen test base-ubuntu-1804
+      - bundle exec kitchen test end-to-end-ubuntu-1804
     after_failure:
       - cat .kitchen/logs/kitchen.log
     env:
@@ -212,7 +212,7 @@ matrix:
       - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
       - cd kitchen-tests
     script:
-      - bundle exec kitchen test base-debian-8
+      - bundle exec kitchen test end-to-end-debian-8
     after_failure:
       - cat .kitchen/logs/kitchen.log
     env:
@@ -229,7 +229,7 @@ matrix:
       - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
       - cd kitchen-tests
     script:
-      - bundle exec kitchen test base-debian-9
+      - bundle exec kitchen test end-to-end-debian-9
     after_failure:
       - cat .kitchen/logs/kitchen.log
     env:
@@ -246,7 +246,7 @@ matrix:
       - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
       - cd kitchen-tests
     script:
-      - bundle exec kitchen test base-centos-6
+      - bundle exec kitchen test end-to-end-centos-6
     after_failure:
       - cat .kitchen/logs/kitchen.log
     env:
@@ -263,7 +263,7 @@ matrix:
       - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
       - cd kitchen-tests
     script:
-      - bundle exec kitchen test base-centos-7
+      - bundle exec kitchen test end-to-end-centos-7
     after_failure:
       - cat .kitchen/logs/kitchen.log
     env:
@@ -280,7 +280,7 @@ matrix:
       - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
       - cd kitchen-tests
     script:
-      - bundle exec kitchen test base-fedora-latest
+      - bundle exec kitchen test end-to-end-fedora-latest
     after_failure:
       - cat .kitchen/logs/kitchen.log
     env:
@@ -297,7 +297,7 @@ matrix:
       - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
       - cd kitchen-tests
     script:
-      - bundle exec kitchen test base-opensuse-leap
+      - bundle exec kitchen test end-to-end-opensuse-leap
     after_failure:
       - cat .kitchen/logs/kitchen.log
     env:
diff --git a/kitchen-tests/Berksfile b/kitchen-tests/Berksfile
index ea45042a2e..50e09ebf3b 100644
--- a/kitchen-tests/Berksfile
+++ b/kitchen-tests/Berksfile
@@ -1,3 +1,3 @@
 source "https://supermarket.chef.io"
 
-cookbook "base", path: "cookbooks/base"
+cookbook "end_to_end", path: "cookbooks/end_to_end"
diff --git a/kitchen-tests/README.md b/kitchen-tests/README.md
index 8dcf9702a5..95234ca383 100644
--- a/kitchen-tests/README.md
+++ b/kitchen-tests/README.md
@@ -19,8 +19,8 @@ chef/kitchen-tests$ bundle exec kitchen list
 You should see output similar to
 
 ```shell
-Instance               Driver   Provisioner  Verifier  Transport  Last Action    Last Error
-base-amazonlinux       Vagrant  ChefGithub   Inspec    Ssh        <Not Created>  <None>
+Instance                     Driver   Provisioner  Verifier  Transport  Last Action    Last Error
+end-to-end-amazonlinux       Vagrant  ChefGithub   Inspec    Ssh        <Not Created>  <None>
 ```
 
 ## Testing
diff --git a/kitchen-tests/cookbooks/base/Berksfile b/kitchen-tests/cookbooks/end_to_end/Berksfile
index 967b9a78b6..967b9a78b6 100644
--- a/kitchen-tests/cookbooks/base/Berksfile
+++ b/kitchen-tests/cookbooks/end_to_end/Berksfile
diff --git a/kitchen-tests/cookbooks/base/README.md b/kitchen-tests/cookbooks/end_to_end/README.md
index 2889a2d0dc..f9bc150e61 100644
--- a/kitchen-tests/cookbooks/base/README.md
+++ b/kitchen-tests/cookbooks/end_to_end/README.md
@@ -1,3 +1,3 @@
-# base
+# end_to_end
 
 A standard chef "base" cookbook that performs various base system configuration tasks using common community cookbooks.
diff --git a/kitchen-tests/cookbooks/base/attributes/default.rb b/kitchen-tests/cookbooks/end_to_end/attributes/default.rb
index 5e8cee6736..5e8cee6736 100644
--- a/kitchen-tests/cookbooks/base/attributes/default.rb
+++ b/kitchen-tests/cookbooks/end_to_end/attributes/default.rb
diff --git a/kitchen-tests/cookbooks/base/libraries/chef-sugar.rb b/kitchen-tests/cookbooks/end_to_end/libraries/chef-sugar.rb
index 90d02a361f..90d02a361f 100644
--- a/kitchen-tests/cookbooks/base/libraries/chef-sugar.rb
+++ b/kitchen-tests/cookbooks/end_to_end/libraries/chef-sugar.rb
diff --git a/kitchen-tests/cookbooks/base/metadata.rb b/kitchen-tests/cookbooks/end_to_end/metadata.rb
index f526318bb7..139ae797a6 100644
--- a/kitchen-tests/cookbooks/base/metadata.rb
+++ b/kitchen-tests/cookbooks/end_to_end/metadata.rb
@@ -1,4 +1,4 @@
-name             "base"
+name             "end_to_end"
 maintainer       ""
 maintainer_email ""
 license          "Apache-2.0"
diff --git a/kitchen-tests/cookbooks/base/recipes/default.rb b/kitchen-tests/cookbooks/end_to_end/recipes/default.rb
index 9175bfbd26..77c5d2438e 100644
--- a/kitchen-tests/cookbooks/base/recipes/default.rb
+++ b/kitchen-tests/cookbooks/end_to_end/recipes/default.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook:: base
+# Cookbook:: end_to_end
 # Recipe:: default
 #
-# Copyright:: 2014-2017, Chef Software, Inc.
+# Copyright:: 2014-2018, Chef Software, Inc.
 #
 
 hostname "chef-travis-ci.chef.io"
diff --git a/kitchen-tests/cookbooks/base/recipes/packages.rb b/kitchen-tests/cookbooks/end_to_end/recipes/packages.rb
index f8ceb342ad..069487486f 100644
--- a/kitchen-tests/cookbooks/base/recipes/packages.rb
+++ b/kitchen-tests/cookbooks/end_to_end/recipes/packages.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook:: base
+# Cookbook:: end_to_end
 # Recipe:: packages
 #
-# Copyright:: 2014-2017, Chef Software, Inc.
+# Copyright:: 2014-2018, Chef Software, Inc.
 #
 
 # this is just a list of package that exist on every O/S we test, and often aren't installed by default.  you don't
diff --git a/kitchen-tests/cookbooks/base/recipes/tests.rb b/kitchen-tests/cookbooks/end_to_end/recipes/tests.rb
index c6095eaeb5..1c9171b9f3 100644
--- a/kitchen-tests/cookbooks/base/recipes/tests.rb
+++ b/kitchen-tests/cookbooks/end_to_end/recipes/tests.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook:: base
+# Cookbook:: end_to_end
 # Recipe:: tests
 #
-# Copyright:: 2014-2017, Chef Software, Inc.
+# Copyright:: 2014-2018, Chef Software, Inc.
 #
 
 #
diff --git a/kitchen-tests/kitchen.travis.yml b/kitchen-tests/kitchen.travis.yml
index 7daf95195f..5aba9f7a02 100644
--- a/kitchen-tests/kitchen.travis.yml
+++ b/kitchen-tests/kitchen.travis.yml
@@ -35,7 +35,7 @@ platforms:
     pid_one_command: /sbin/init
     intermediate_instructions:
       # TODO: inspec 2.0 requires gcc-c++, adding here until it can be added to appbundler-updater
-      - RUN yum -y install sudo gcc-c++
+      - RUN yum -y install gcc-c++
       - RUN sed -i -e "s/Defaults.*requiretty.*/Defaults    !requiretty/g" /etc/sudoers
 
 - name: amazonlinux-2
@@ -43,7 +43,7 @@ platforms:
     image: dokken/amazonlinux-2
     pid_one_command: /usr/lib/systemd/systemd
     intermediate_instructions:
-      - RUN yum -y install sudo gcc-c++
+      - RUN yum -y install gcc-c++
       - RUN sed -i -e "s/Defaults.*requiretty.*/Defaults    !requiretty/g" /etc/sudoers
 
 - name: debian-8
@@ -52,7 +52,6 @@ platforms:
     pid_one_command: /bin/systemd
     intermediate_instructions:
       - RUN /usr/bin/apt-get update
-      - RUN /usr/bin/apt-get -y install sudo
 
 - name: debian-9
   driver:
@@ -60,14 +59,13 @@ platforms:
     pid_one_command: /bin/systemd
     intermediate_instructions:
       - RUN /usr/bin/apt-get update
-      - RUN /usr/bin/apt-get -y install sudo
 
 - name: centos-6
   driver:
     image: dokken/centos-6
     pid_one_command: /sbin/init
     intermediate_instructions:
-      - RUN yum -y install sudo gcc-c++
+      - RUN yum -y install gcc-c++
       - RUN sed -i -e "s/Defaults.*requiretty.*/Defaults    !requiretty/g" /etc/sudoers
 
 - name: centos-7
@@ -75,7 +73,7 @@ platforms:
     image: dokken/centos-7
     pid_one_command: /usr/lib/systemd/systemd
     intermediate_instructions:
-      - RUN yum -y install sudo gcc-c++
+      - RUN yum -y install gcc-c++
       - RUN sed -i -e "s/Defaults.*requiretty.*/Defaults    !requiretty/g" /etc/sudoers
 
 - name: fedora-latest
@@ -83,7 +81,7 @@ platforms:
     image: dokken/fedora-latest
     pid_one_command: /usr/lib/systemd/systemd
     intermediate_instructions:
-      - RUN dnf -y install sudo gcc-c++
+      - RUN dnf -y install gcc-c++
       - RUN sed -i -e "s/Defaults.*requiretty.*/Defaults    !requiretty/g" /etc/sudoers
 
 - name: ubuntu-14.04
@@ -92,7 +90,6 @@ platforms:
     pid_one_command: /sbin/init
     intermediate_instructions:
       - RUN /usr/bin/apt-get update
-      - RUN /usr/bin/apt-get -y install sudo
 
 - name: ubuntu-16.04
   driver:
@@ -100,7 +97,6 @@ platforms:
     pid_one_command: /bin/systemd
     intermediate_instructions:
       - RUN /usr/bin/apt-get update
-      - RUN /usr/bin/apt-get -y install sudo
 
 - name: ubuntu-18.04
   driver:
@@ -108,16 +104,15 @@ platforms:
     pid_one_command: /bin/systemd
     intermediate_instructions:
       - RUN /usr/bin/apt-get update
-      - RUN /usr/bin/apt-get -y install sudo
 
 - name: opensuse-leap
   driver:
     image: dokken/opensuse-leap
     pid_one_command: /bin/systemd
     intermediate_instructions:
-      - RUN /usr/bin/zypper install -y sudo gcc-c++
+      - RUN /usr/bin/zypper install -y gcc-c++
 
 suites:
-  - name: base
+  - name: end-to-end
     run_list:
-      - recipe[base::default]
+      - recipe[end_to_end::default]
diff --git a/kitchen-tests/kitchen.yml b/kitchen-tests/kitchen.yml
index 9133401c7c..7e654f1491 100644
--- a/kitchen-tests/kitchen.yml
+++ b/kitchen-tests/kitchen.yml
@@ -34,6 +34,6 @@ platforms:
   - name: ubuntu-18.04
 
 suites:
-  - name: base
+  - name: end-to-end
     run_list:
-      - recipe[base::default]
+      - recipe[end_to_end::default]