Fix chefspec and berkshelf tests

These are still on master for now Signed-off-by: Tim Smith <[email protected]>
skillstream · Aug 24, 2021 · 511f532 · 511f532
1 parent da97d20
commit 511f532
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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",
 }