diff options
| author | tyler-ball <tball@chef.io> | 2018-12-19 16:17:14 -0700 |
|---|---|---|
| committer | Mark Anderson <mark@chef.io> | 2019-05-03 19:19:10 -0700 |
| commit | b134493e65d73636d25aa569f9b77f9c0b4c3f88 (patch) | |
| tree | b7969e6aea16fdedda9de9b3a344900438c00dd4 /kitchen-tests | |
| parent | c83bdc4c6adefe29f15ae5bad9eb8f5a6ba30b7e (diff) | |
| download | chef-b134493e65d73636d25aa569f9b77f9c0b4c3f88.tar.gz | |
Adding in the license-acceptance flow
This adds a new feature to chef-client where users must accept the
EULA before using the product. Users can accept the license by
passing '--chef-license accept', setting ENV[CHEF_LICENSE]=accept or by
running 'chef-client' and following the interactive prompt.
Signed-off-by: tyler-ball <tball@chef.io>
Diffstat (limited to 'kitchen-tests')
| -rw-r--r-- | kitchen-tests/Berksfile | 1 | ||||
| -rw-r--r-- | kitchen-tests/Gemfile | 2 | ||||
| -rw-r--r-- | kitchen-tests/cookbooks/end_to_end/Berksfile | 3 | ||||
| -rw-r--r-- | kitchen-tests/cookbooks/end_to_end/attributes/default.rb | 2 | ||||
| -rw-r--r-- | kitchen-tests/cookbooks/rspec/templates/run-chef-rspec | 1 | ||||
| -rw-r--r-- | kitchen-tests/kitchen.yml | 1 |
6 files changed, 6 insertions, 4 deletions
diff --git a/kitchen-tests/Berksfile b/kitchen-tests/Berksfile index d699452ebe..df9f0427e6 100644 --- a/kitchen-tests/Berksfile +++ b/kitchen-tests/Berksfile @@ -2,3 +2,4 @@ source "https://supermarket.chef.io" cookbook "end_to_end", path: "cookbooks/end_to_end" cookbook "rspec", path: "cookbooks/rspec" +cookbook "chef-client", git: "https://github.com/tyler-ball/chef-client.git", branch: "chef_license_accept" diff --git a/kitchen-tests/Gemfile b/kitchen-tests/Gemfile index c2437a307b..a8d064fb80 100644 --- a/kitchen-tests/Gemfile +++ b/kitchen-tests/Gemfile @@ -7,4 +7,4 @@ gem "berkshelf", git: "https://github.com/berkshelf/berkshelf.git", branch: "mas gem "kitchen-dokken", "~> 2.0" gem "kitchen-inspec", git: "https://github.com/chef/kitchen-inspec.git", branch: "master" gem "inspec", git: "https://github.com/inspec/inspec.git", branch: "master" # this goes away when we ship inspec 4 -gem "test-kitchen", git: "https://github.com/test-kitchen/test-kitchen.git", branch: "master" +gem "test-kitchen", git: "https://github.com/test-kitchen/test-kitchen.git", branch: "chef_license_accept" diff --git a/kitchen-tests/cookbooks/end_to_end/Berksfile b/kitchen-tests/cookbooks/end_to_end/Berksfile deleted file mode 100644 index 967b9a78b6..0000000000 --- a/kitchen-tests/cookbooks/end_to_end/Berksfile +++ /dev/null @@ -1,3 +0,0 @@ -source "https://supermarket.chef.io" - -metadata diff --git a/kitchen-tests/cookbooks/end_to_end/attributes/default.rb b/kitchen-tests/cookbooks/end_to_end/attributes/default.rb index 5e8cee6736..b8ac7f8119 100644 --- a/kitchen-tests/cookbooks/end_to_end/attributes/default.rb +++ b/kitchen-tests/cookbooks/end_to_end/attributes/default.rb @@ -62,6 +62,8 @@ default["chef_client"]["splay"] = 1800 # only log what we change default["chef_client"]["config"]["verbose_logging"] = false +default["chef_client"]["chef_license"] = "accept-no-persist" + # # resolver cookbook overrides # diff --git a/kitchen-tests/cookbooks/rspec/templates/run-chef-rspec b/kitchen-tests/cookbooks/rspec/templates/run-chef-rspec index 54c4297479..4a1eb54b48 100644 --- a/kitchen-tests/cookbooks/rspec/templates/run-chef-rspec +++ b/kitchen-tests/cookbooks/rspec/templates/run-chef-rspec @@ -8,4 +8,5 @@ export PATH=/opt/chef/embedded/bin:$PATH cd /opt/chef/embedded/apps/chef /opt/chef/embedded/bin/bundle install +export CHEF_LICENSE=accept-no-persist /opt/chef/embedded/bin/bundle exec /opt/chef/embedded/bin/rspec --format progress diff --git a/kitchen-tests/kitchen.yml b/kitchen-tests/kitchen.yml index 5fe3b8540f..0b4b1964fc 100644 --- a/kitchen-tests/kitchen.yml +++ b/kitchen-tests/kitchen.yml @@ -12,6 +12,7 @@ provisioner: name: dokken client_rb: diff_disabled: true + chef_license: "accept-no-persist" lifecycle: pre_converge: |