diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2018-04-23 13:16:52 -0700 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2018-04-23 13:18:05 -0700 |
| commit | e9cedd0d497812a5f481ec55c9096bd8ee2d2aae (patch) | |
| tree | 4352766f504368a1855dad44af17e73cae9ec0f2 | |
| parent | 0e5ad786acf652f9a537c8e5cb4dd7c6401c438e (diff) | |
| download | chef-e9cedd0d497812a5f481ec55c9096bd8ee2d2aae.tar.gz | |
test chef-zero against chef_fs in the chef/chef checkout
goes red because we're really red here
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
| -rw-r--r-- | .travis.yml | 7 | ||||
| -rwxr-xr-x | tasks/bin/run_external_test | 8 |
2 files changed, 10 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index 4d0626ee52..effdfc07a5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -88,9 +88,10 @@ matrix: script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake rvm: 2.5.1 - env: - PEDANT_OPTS: --skip-oc_id - TEST_GEM: chef/chef-zero - script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake spec cheffs + - PEDANT_OPTS=--skip-oc_id + - TEST_GEM=chef/chef-zero + - CHEF_FS=true + script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake pedant rvm: 2.5.1 - env: TEST_GEM: chef/cheffish diff --git a/tasks/bin/run_external_test b/tasks/bin/run_external_test index 1925c3e125..01eba18943 100755 --- a/tasks/bin/run_external_test +++ b/tasks/bin/run_external_test @@ -11,6 +11,10 @@ include Chef::Mixin::ShellOut github_repo = ARGV.shift git_thing = ARGV.shift +build_dir = File.expand_path(ENV["TRAVIS_BUILD_DIR"] || Dir.pwd) + +env = { "GEMFILE_MOD" => "gem 'chef', path: '#{build_dir}'" } + Dir.mktmpdir("chef-external-test") do |dir| git_url = "https://github.com/#{github_repo}" Dir.rmdir dir @@ -18,8 +22,8 @@ Dir.mktmpdir("chef-external-test") do |dir| Dir.chdir(dir) do shell_out!("git checkout #{git_thing}", live_stream: STDOUT) Bundler.with_clean_env do - shell_out!("bundle install", live_stream: STDOUT) - shell_out!("bundle exec #{ARGV.join(" ")}", live_stream: STDOUT) + shell_out!("bundle install", live_stream: STDOUT, env: env) + shell_out!("bundle exec #{ARGV.join(" ")}", live_stream: STDOUT, env: env) end end end |