diff options
| -rw-r--r-- | azure-pipelines.yml | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/azure-pipelines.yml b/azure-pipelines.yml index c87781b1e1..bdd01b1682 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -6,8 +6,7 @@ variables: trigger: - master -# TODO: 20190528 - should we be testing end_to_end on chef-15? -#- chef-15 +- chef-16 pool: vmImage: $(imageName) @@ -40,10 +39,8 @@ jobs: - script: | cd kitchen-tests - sudo /opt/chef/embedded/bin/bundle config set without 'omnibus_package ruby_prof' sudo /opt/chef/embedded/bin/bundle install --jobs=3 --retry=3 --path=vendor/bundle - sudo /opt/chef/embedded/bin/gem install berkshelf --no-doc - sudo /opt/chef/embedded/bin/berks vendor cookbooks + sudo /opt/chef/embedded/bin/bundle bundle berks vendor cookbooks sudo /opt/chef/bin/chef-client -z -o end_to_end --chef-license accept-no-persist displayName: 'Run end_to_end::default recipe' @@ -77,14 +74,12 @@ jobs: - powershell: | cd kitchen-tests $env:PATH = "C:\opscode\chef\bin;C:\opscode\chef\embedded\bin;" + $env:PATH - bundle config set without 'omnibus_package ruby_prof' bundle install --jobs=3 --retry=3 --path=vendor/bundle - gem install berkshelf --no-doc # berks emits a ruby warning when it loads net/http due to a previously # defined constant. Even though it is just a warning, powershell immediately # exits 1. I'm not sure why but this just suppresses the warnings. $env:RUBYOPT="-W0" - berks vendor cookbooks + bundle exec berks vendor cookbooks # restore the default warning level $env:RUBYOPT="-W1" chef-client -z -o end_to_end --chef-license accept-no-persist |