diff options
author | Tim Smith <tsmith@chef.io> | 2018-06-20 10:36:34 -0700 |
---|---|---|
committer | Tim Smith <tsmith@chef.io> | 2018-06-27 11:40:00 -0700 |
commit | 6fbbeca577117dc8244a4d29e0c028590ef81bfb (patch) | |
tree | aa06492c2c8430dcb2deb6ea3959a8c19ec891c4 /kitchen-tests | |
parent | 4b35ecd3bd8ef3c56fc75c7d0bffb440244b0e50 (diff) | |
download | chef-6fbbeca577117dc8244a4d29e0c028590ef81bfb.tar.gz |
Rename the kitchen base test suite to end-to-end
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>
Diffstat (limited to 'kitchen-tests')
-rw-r--r-- | kitchen-tests/Berksfile | 2 | ||||
-rw-r--r-- | kitchen-tests/README.md | 4 | ||||
-rw-r--r-- | kitchen-tests/cookbooks/end_to_end/Berksfile (renamed from kitchen-tests/cookbooks/base/Berksfile) | 0 | ||||
-rw-r--r-- | kitchen-tests/cookbooks/end_to_end/README.md (renamed from kitchen-tests/cookbooks/base/README.md) | 2 | ||||
-rw-r--r-- | kitchen-tests/cookbooks/end_to_end/attributes/default.rb (renamed from kitchen-tests/cookbooks/base/attributes/default.rb) | 0 | ||||
-rw-r--r-- | kitchen-tests/cookbooks/end_to_end/libraries/chef-sugar.rb (renamed from kitchen-tests/cookbooks/base/libraries/chef-sugar.rb) | 0 | ||||
-rw-r--r-- | kitchen-tests/cookbooks/end_to_end/metadata.rb (renamed from kitchen-tests/cookbooks/base/metadata.rb) | 9 | ||||
-rw-r--r-- | kitchen-tests/cookbooks/end_to_end/recipes/default.rb (renamed from kitchen-tests/cookbooks/base/recipes/default.rb) | 4 | ||||
-rw-r--r-- | kitchen-tests/cookbooks/end_to_end/recipes/packages.rb (renamed from kitchen-tests/cookbooks/base/recipes/packages.rb) | 4 | ||||
-rw-r--r-- | kitchen-tests/cookbooks/end_to_end/recipes/tests.rb (renamed from kitchen-tests/cookbooks/base/recipes/tests.rb) | 4 | ||||
-rw-r--r-- | kitchen-tests/kitchen.travis.yml | 4 | ||||
-rw-r--r-- | kitchen-tests/kitchen.yml | 4 |
12 files changed, 17 insertions, 20 deletions
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..c5300705c6 100644 --- a/kitchen-tests/cookbooks/base/metadata.rb +++ b/kitchen-tests/cookbooks/end_to_end/metadata.rb @@ -1,10 +1,7 @@ -name "base" -maintainer "" -maintainer_email "" +name "end_to_end" license "Apache-2.0" description "Installs/Configures base" -long_description "Installs/Configures base" -version "0.1.0" +version "1.0.0" gem "chef-sugar" @@ -23,7 +20,7 @@ depends "git" supports "ubuntu" supports "debian" -supports "redhat" +supports "centos" supports "opensuse" supports "fedora" supports "amazon" 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 ec6a099458..3736fb2fab 100644 --- a/kitchen-tests/kitchen.travis.yml +++ b/kitchen-tests/kitchen.travis.yml @@ -105,6 +105,6 @@ platforms: pid_one_command: /bin/systemd 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] |