diff options
| author | Lamont Granquist <454857+lamont-granquist@users.noreply.github.com> | 2021-08-24 20:30:13 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-24 20:30:13 -0700 |
| commit | 777e5662f1931edf5990c39eb56bf4b3d8480a74 (patch) | |
| tree | 1028fdbd05056987c4a764dcae564beb3757c6f1 | |
| parent | cdc7d6b89593dcf5b7c2e0cdcfa2a4019cf35fe1 (diff) | |
| parent | 21db489921b5092344ed3a5e736054c20dbe8e4a (diff) | |
| download | chef-777e5662f1931edf5990c39eb56bf4b3d8480a74.tar.gz | |
Merge pull request #11953 from chef/lcg/moremain
| -rw-r--r-- | .expeditor/verify.pipeline.yml | 2 | ||||
| -rw-r--r-- | kitchen-tests/Gemfile | 2 | ||||
| -rw-r--r-- | omnibus_overrides.rb | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index 8df28bdd26..4320ed397e 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -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 master rake + - bundle exec tasks/bin/run_external_test berkshelf/berkshelf main rake expeditor: executor: docker: diff --git a/kitchen-tests/Gemfile b/kitchen-tests/Gemfile index 6a5301bdaa..af870fb182 100644 --- a/kitchen-tests/Gemfile +++ b/kitchen-tests/Gemfile @@ -4,7 +4,7 @@ gem "rake" # required to build some native extensions gem "chef", path: ".." gem "knife", path: "../knife" gem "ohai", git: "https://github.com/chef/ohai.git", branch: "main" # avoids failures when we bump chef major -gem "berkshelf", git: "https://github.com/berkshelf/berkshelf.git", branch: "master" +gem "berkshelf", git: "https://github.com/berkshelf/berkshelf.git", branch: "main" gem "kitchen-dokken", ">= 2.0" gem "kitchen-inspec", git: "https://github.com/chef/kitchen-inspec.git", branch: "main" gem "inspec" diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb index b536b58fd5..127c6bf24e 100644 --- a/omnibus_overrides.rb +++ b/omnibus_overrides.rb @@ -1,4 +1,3 @@ - # THIS IS NOW HAND MANAGED, JUST EDIT THE THING # keep it machine-parsable since CI uses it # |