From f9736130920c45011397ee368815db5a679f9d80 Mon Sep 17 00:00:00 2001 From: Salim Alam Date: Tue, 12 Jan 2016 14:48:32 -0800 Subject: Do some clean up --- acceptance/Gemfile | 16 ++- acceptance/Gemfile.lock | 135 --------------------- acceptance/README.md | 20 +-- .../acceptance-cookbook/recipes/verify.rb | 3 +- acceptance/trivial/chefignore | 1 - 5 files changed, 18 insertions(+), 157 deletions(-) delete mode 100644 acceptance/Gemfile.lock delete mode 100644 acceptance/trivial/chefignore diff --git a/acceptance/Gemfile b/acceptance/Gemfile index af2bbf815b..3de932f988 100644 --- a/acceptance/Gemfile +++ b/acceptance/Gemfile @@ -1,12 +1,10 @@ source 'https://rubygems.org' -gem "mixlib-install", github: "chef/mixlib-install" -gem "chef-acceptance", github: "chef/chef-acceptance" -gem "test-kitchen", github: "sersut/test-kitchen", branch: "sersut/mixlib-install-update" +gem 'mixlib-install', github: 'chef/mixlib-install' +gem 'chef-acceptance', github: 'chef/chef-acceptance' +gem 'test-kitchen', github: 'sersut/test-kitchen', + branch: 'sersut/mixlib-install-update' gem 'kitchen-inspec' - -group(:development) do - gem "kitchen-vagrant" - gem "windows_chef_zero" - gem "winrm-transport" -end +gem 'kitchen-vagrant' +gem 'windows_chef_zero' +gem 'winrm-transport' diff --git a/acceptance/Gemfile.lock b/acceptance/Gemfile.lock deleted file mode 100644 index e53c19776a..0000000000 --- a/acceptance/Gemfile.lock +++ /dev/null @@ -1,135 +0,0 @@ -GIT - remote: git://github.com/chef/chef-acceptance.git - revision: 47f5f54e561981802122168ca01ae03907965312 - specs: - chef-acceptance (0.2.0) - thor (~> 0.19) - -GIT - remote: git://github.com/chef/mixlib-install.git - revision: 90533f4268765ed48b4b0bd22b5aa4d9fcef0b48 - specs: - mixlib-install (0.8.0.alpha.3) - artifactory (~> 2.3.0) - mixlib-versioning (~> 1.1.0) - -GIT - remote: git://github.com/sersut/test-kitchen.git - revision: fd05389ec556fdcac96b92b1aea2a9ed48802e75 - branch: sersut/mixlib-install-update - specs: - test-kitchen (1.4.3.dev.0) - mixlib-shellout (>= 1.2, < 3.0) - net-scp (~> 1.1) - net-ssh (~> 2.7, < 2.10) - safe_yaml (~> 1.0) - thor (~> 0.18) - -GEM - remote: https://rubygems.org/ - specs: - artifactory (2.3.2) - builder (3.2.2) - coderay (1.1.0) - diff-lcs (1.2.5) - docker-api (1.24.1) - excon (>= 0.38.0) - json - excon (0.45.4) - ffi (1.9.10) - gssapi (1.2.0) - ffi (>= 1.0.1) - gyoku (1.3.1) - builder (>= 2.1.2) - httpclient (2.7.1) - inspec (0.9.8) - json (~> 1.8) - method_source (~> 0.8) - pry (~> 0) - r-train (~> 0.9, >= 0.9.3) - rainbow (~> 2) - rspec (~> 3.3) - rspec-its (~> 1.2) - rubyzip (~> 1.1) - thor (~> 0.19) - json (1.8.3) - kitchen-inspec (0.10.0) - inspec (~> 0.9) - kitchen-vagrant (0.19.0) - test-kitchen (~> 1.4) - little-plugger (1.1.4) - logging (2.0.0) - little-plugger (~> 1.1) - multi_json (~> 1.10) - method_source (0.8.2) - mixlib-shellout (2.2.5) - mixlib-versioning (1.1.0) - multi_json (1.11.2) - net-scp (1.2.1) - net-ssh (>= 2.6.5) - net-ssh (2.9.2) - nori (2.6.0) - pry (0.10.3) - coderay (~> 1.1.0) - method_source (~> 0.8.1) - slop (~> 3.4) - r-train (0.9.3) - docker-api (~> 1.22) - json (~> 1.8) - mixlib-shellout (~> 2.1) - net-scp (~> 1.2) - net-ssh (~> 2.9) - winrm (~> 1.3) - winrm-transport (~> 1.0) - rainbow (2.0.0) - rspec (3.4.0) - rspec-core (~> 3.4.0) - rspec-expectations (~> 3.4.0) - rspec-mocks (~> 3.4.0) - rspec-core (3.4.1) - rspec-support (~> 3.4.0) - rspec-expectations (3.4.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.4.0) - rspec-its (1.2.0) - rspec-core (>= 3.0.0) - rspec-expectations (>= 3.0.0) - rspec-mocks (3.4.1) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.4.0) - rspec-support (3.4.1) - rubyntlm (0.4.0) - rubyzip (1.1.7) - safe_yaml (1.0.4) - slop (3.6.0) - thor (0.19.1) - uuidtools (2.1.5) - windows_chef_zero (2.0.0) - test-kitchen (>= 1.2.1) - winrm (1.5.0) - builder (>= 2.1.2) - gssapi (~> 1.2) - gyoku (~> 1.0) - httpclient (~> 2.2, >= 2.2.0.2) - logging (>= 1.6.1, < 3.0) - nori (~> 2.0) - rubyntlm (~> 0.4.0) - uuidtools (~> 2.1.2) - winrm-transport (1.0.3) - rubyzip (~> 1.1, >= 1.1.7) - winrm (~> 1.3) - -PLATFORMS - ruby - -DEPENDENCIES - chef-acceptance! - kitchen-inspec - kitchen-vagrant - mixlib-install! - test-kitchen! - windows_chef_zero - winrm-transport - -BUNDLED WITH - 1.11.2 diff --git a/acceptance/README.md b/acceptance/README.md index b14fbbb376..5f6bfc45ba 100644 --- a/acceptance/README.md +++ b/acceptance/README.md @@ -6,12 +6,20 @@ release readiness. The tests use the _chef-acceptance_ gem as the high level framework. All the gems needed to run these tests can be installed with Bundler. +### Important Note! +Before running chef-acceptance, you *MUST* do the following on your current session: + +``` +export APPBUNDLER_ALLOW_RVM=true +``` + +### Setting up and running a test suite +To get started, do a bundle install from the acceptance directory: ```shell chef/acceptance$ bundle install ``` -To ensure everything is working properly, run: - +To get some basic info and ensure chef-acceptance can be run, do: ```shell chef/acceptance$ bundle exec chef-acceptance info ``` @@ -20,11 +28,3 @@ To run a particular test suite, do the following: ```shell chef/acceptance$ bundle exec chef-acceptance test TEST_SUITE ``` - -### Important Note! - -Before running chef-acceptance, you *MUST* do the following on your current session: - -``` -export APPBUNDLER_ALLOW_RVM=true -``` diff --git a/acceptance/trivial/.acceptance/acceptance-cookbook/recipes/verify.rb b/acceptance/trivial/.acceptance/acceptance-cookbook/recipes/verify.rb index eb58f81f79..c0b67bf500 100644 --- a/acceptance/trivial/.acceptance/acceptance-cookbook/recipes/verify.rb +++ b/acceptance/trivial/.acceptance/acceptance-cookbook/recipes/verify.rb @@ -1,4 +1,3 @@ -# execute "inspec exec inspec/test.rb -t ssh://vagrant@chef-current-install-ubuntu-1404" do -execute "bundle exec kitchen verify" do +execute 'bundle exec kitchen verify' do cwd node['chef-acceptance']['suite-dir'] end diff --git a/acceptance/trivial/chefignore b/acceptance/trivial/chefignore deleted file mode 100644 index 7be3c6dfaf..0000000000 --- a/acceptance/trivial/chefignore +++ /dev/null @@ -1 +0,0 @@ -.kitchen -- cgit v1.2.1