Merge pull request #8930 from chef/bump_inspec

Update inspec to 4.17.11 and cleanup buildkite testing a bit

5 files changed, 16 insertions, 52 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index 37f50ed430..9fb9763da7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -153,7 +153,7 @@ GEM
     ed25519 (1.2.4)
     equatable (0.6.1)
     erubis (2.7.0)
-    faraday (0.15.4)
+    faraday (0.16.2)
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
@@ -177,7 +177,7 @@ GEM
     htmlentities (4.3.4)
     httpclient (2.8.3)
     iniparse (1.4.4)
-    inspec-core (4.17.7)
+    inspec-core (4.17.11)
       addressable (~> 2.4)
       faraday (>= 0.9.0)
       faraday_middleware (~> 0.12.2)
@@ -202,8 +202,8 @@ GEM
       train-core (~> 3.0)
       tty-prompt (~> 0.17)
       tty-table (~> 0.10)
-    inspec-core-bin (4.17.7)
-      inspec-core (= 4.17.7)
+    inspec-core-bin (4.17.11)
+      inspec-core (= 4.17.11)
     ipaddress (0.8.3)
     iso8601 (0.12.1)
     jaro_winkler (1.5.3)
@@ -359,7 +359,7 @@ GEM
     unicode-display_width (1.6.0)
     unicode_utils (1.4.0)
     uuidtools (2.1.5)
-    webmock (3.7.5)
+    webmock (3.7.6)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
diff --git a/kitchen-tests/kitchen.bk.yml b/kitchen-tests/kitchen.bk.yml
deleted file mode 100644
index 138b8aa0f9..0000000000
--- a/kitchen-tests/kitchen.bk.yml
+++ /dev/null
@@ -1,38 +0,0 @@
----
-driver:
-  name: docker
-  use_internal_docker_network: true
-  # socket: "tcp://127.0.0.1:2375"
-
-
-verifier:
-  name: inspec
-  format: progress
-
-provisioner:
-  name: chef_github
-  chef_omnibus_url: "https://omnitruck.chef.io/install.sh"
-  chef_omnibus_install_options: "-c current"
-  github_owner: "chef"
-  github_repo: "chef"
-  ohai_refname: "master"
-  refname: <%= %x(git rev-parse HEAD) %>
-  client_rb:
-    diff_disabled: true
-
-platforms:
-  - name: amazonlinux
-  # - name: amazonlinux-2
-  - name: centos-6
-  - name: centos-7
-  - name: debian-8
-  - name: debian-9
-  - name: opensuse-leap-42
-  - name: ubuntu-16.04
-  - name: ubuntu-18.04
-
-suites:
-  - name: end-to-end
-    run_list:
-      - recipe[end_to_end::default]
-      - recipe[end_to_end::tests]
diff --git a/kitchen-tests/kitchen.yml b/kitchen-tests/kitchen.yml
index ec842b8f4a..18ae4bcae1 100644
--- a/kitchen-tests/kitchen.yml
+++ b/kitchen-tests/kitchen.yml
@@ -19,7 +19,9 @@ lifecycle:
     - remote: echo "Chef container's Chef / Ohai release:"
     - remote: /opt/chef/embedded/bin/chef-client -v
     - remote: /opt/chef/embedded/bin/ohai -v
-    - remote: /opt/chef/embedded/bin/gem install appbundler appbundle-updater
+    - remote: /opt/chef/embedded/bin/rake --version
+    - remote: /opt/chef/embedded/bin/bundle -v
+    - remote: /opt/chef/embedded/bin/gem install appbundler appbundle-updater --no-doc
     - remote: /opt/chef/embedded/bin/appbundle-updater chef ohai <%= File.readlines('../Gemfile.lock', File.expand_path(File.dirname(__FILE__))).find { |l| l =~ /^\s+ohai \((\d+\.\d+\.\d+)\)/ }; 'v' + $1 %> --tarball --github chef/ohai
     - remote: /opt/chef/embedded/bin/appbundle-updater chef chef <%= ENV['BUILDKITE_COMMIT']  || %x(git rev-parse HEAD).chomp %> --tarball --github chef/chef
     - remote: echo "Installed Chef / Ohai release:"
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index bb117de417..def390466c 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -33,7 +33,7 @@ GEM
     artifactory (3.0.5)
     awesome_print (1.8.0)
     aws-eventstream (1.0.3)
-    aws-partitions (1.218.0)
+    aws-partitions (1.219.0)
     aws-sdk-core (3.68.0)
       aws-eventstream (~> 1.0, >= 1.0.2)
       aws-partitions (~> 1.0)
@@ -158,7 +158,7 @@ GEM
     ed25519 (1.2.4)
     equatable (0.6.1)
     erubis (2.7.0)
-    faraday (0.15.4)
+    faraday (0.16.2)
       multipart-post (>= 1.2, < 3)
     ffi (1.11.1)
     ffi (1.11.1-x64-mingw32)
@@ -191,7 +191,7 @@ GEM
       tomlrb (~> 1.2)
       tty-box (~> 0.3)
       tty-prompt (~> 0.18)
-    license_scout (1.0.24)
+    license_scout (1.0.28)
       ffi-yajl (~> 2.2)
       mixlib-shellout (~> 2.2)
       toml-rb (~> 1.0)
@@ -264,7 +264,7 @@ GEM
     retryable (3.0.4)
     ruby-progressbar (1.10.1)
     rubyntlm (0.6.2)
-    rubyzip (1.2.4)
+    rubyzip (1.3.0)
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
diff --git a/scripts/bk_tests/bk_linux_exec.sh b/scripts/bk_tests/bk_linux_exec.sh
index fee73aa6bb..12c7594a8d 100755
--- a/scripts/bk_tests/bk_linux_exec.sh
+++ b/scripts/bk_tests/bk_linux_exec.sh
@@ -30,11 +30,11 @@ sudo git clone https://github.com/asdf-vm/asdf.git /opt/asdf
 . /opt/asdf/completions/asdf.bash
 
 echo "--- Installing Ruby ASDF plugin"
-/opt/asdf/bin/asdf plugin-add ruby https://github.com/asdf-vm/asdf-ruby.git 
+/opt/asdf/bin/asdf plugin-add ruby https://github.com/asdf-vm/asdf-ruby.git
 
-echo "--- Installing Ruby 2.5.5"
-/opt/asdf/bin/asdf install ruby 2.5.5
-/opt/asdf/bin/asdf global ruby 2.5.5
+echo "--- Installing Ruby 2.6.4"
+/opt/asdf/bin/asdf install ruby 2.6.4
+/opt/asdf/bin/asdf global ruby 2.6.4
 
 # Update Gems
 gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2)