diff options
| author | Tim Smith <tsmith84@gmail.com> | 2019-09-30 11:22:43 -0700 |
|---|---|---|
| committer | Tim Smith <tsmith84@gmail.com> | 2019-09-30 12:28:22 -0700 |
| commit | a5f31197f47283e7b808fca8442b10439332457b (patch) | |
| tree | 5b19169c80d0a308a2b726469455028bc4717df8 | |
| parent | aa494dced9ebd99ae145a16950079dfb8b1c029f (diff) | |
| download | chef-a5f31197f47283e7b808fca8442b10439332457b.tar.gz | |
Avoid rake failures in the test kitchen tests
Also skip the docs installs here to speed things up
Signed-off-by: Tim Smith <tsmith@chef.io>
| -rw-r--r-- | kitchen-tests/kitchen.bk.yml | 38 | ||||
| -rw-r--r-- | kitchen-tests/kitchen.yml | 4 | ||||
| -rwxr-xr-x | scripts/bk_tests/bk_linux_exec.sh | 8 |
3 files changed, 7 insertions, 43 deletions
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/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) |