diff options
| author | Tim Smith <tsmith84@gmail.com> | 2021-08-24 15:44:09 -0700 |
|---|---|---|
| committer | Tim Smith <tsmith84@gmail.com> | 2021-08-24 15:51:18 -0700 |
| commit | 511f53274f8cfa25c7057d4bfd1c25d2133f7670 (patch) | |
| tree | 32a5c57f83053640d54d8fc6fba773daeaf6c97a | |
| parent | da97d2039b91c0e6901b27f63e0214514a52f67f (diff) | |
| download | chef-511f53274f8cfa25c7057d4bfd1c25d2133f7670.tar.gz | |
Fix chefspec and berkshelf tests
These are still on master for now
Signed-off-by: Tim Smith <tsmith@chef.io>
| -rw-r--r-- | .expeditor/verify.pipeline.yml | 4 | ||||
| -rwxr-xr-x | tasks/bin/run_external_test | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index 5bbfb25e9c..8df28bdd26 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -305,7 +305,7 @@ steps: - /workdir/.expeditor/scripts/bk_container_prep.sh - bundle config set --local without omnibus_package - bundle install --jobs=3 --retry=3 --path=vendor/bundle - - bundle exec tasks/bin/run_external_test chefspec/chefspec main rake + - bundle exec tasks/bin/run_external_test chefspec/chefspec master rake expeditor: executor: docker: @@ -329,7 +329,7 @@ steps: - apt-get install -y graphviz - bundle config set --local without omnibus_package - bundle install --jobs=3 --retry=3 --path=vendor/bundle - - bundle exec tasks/bin/run_external_test berkshelf/berkshelf main rake + - bundle exec tasks/bin/run_external_test berkshelf/berkshelf master rake expeditor: executor: docker: diff --git a/tasks/bin/run_external_test b/tasks/bin/run_external_test index 2d191adbb4..45568f51ac 100755 --- a/tasks/bin/run_external_test +++ b/tasks/bin/run_external_test @@ -21,7 +21,7 @@ build_dir = Dir.pwd env = { "GEMFILE_MOD" => "gem 'chef', path: '#{build_dir}'; " \ - "gem 'ohai', git: 'https://github.com/chef/ohai.git', branch: 'master'", + "gem 'ohai', git: 'https://github.com/chef/ohai.git', branch: 'main'", "CHEF_LICENSE" => "accept-no-persist", } |