Merge pull request #11947 from chef/lcg/testmain

11 files changed, 35 insertions, 37 deletions

diff --git a/.buildkite/hooks/pre-command b/.buildkite/hooks/pre-command
index 6f9dcecdf6..9af5d459b5 100644
--- a/.buildkite/hooks/pre-command
+++ b/.buildkite/hooks/pre-command
@@ -8,31 +8,31 @@ set -eu
 docker ps || true
 free -m || true
 
-# We've now seen cases where origin/master on the build hosts can get
+# We've now seen cases where origin/main on the build hosts can get
 # out of date. This causes us to build components unnecessarily.
 # Fetching it here hopefully will prevent this situation.
-echo "Fetching origin/master"
-git fetch origin master
+echo "Fetching origin/main"
+git fetch origin main
 
 # DEBUGGING FOR RELENG
 # Fetch the git tags to see if that addresses the weird smart build behavior for Habitat
 git fetch --tags --force
 
-# Rebase onto current master to ensure this PR is closer to what happens when it's merged.
+# Rebase onto current main to ensure this PR is closer to what happens when it's merged.
 # Only do this if it's actually a branch (i.e. a PR or a manually created build), not a
-# post-merge CI run of master.
-if [[ "$BUILDKITE_BRANCH" != "master" ]]; then
+# post-merge CI run of main.
+if [[ "$BUILDKITE_BRANCH" != "main" ]]; then
   git config user.email "you@example.com" # these are needed for the rebase attempt
   git config user.name "Your Name"
-  master=$(git show-ref -s --abbrev origin/master)
+  main=$(git show-ref -s --abbrev origin/main)
   pr_head=$(git show-ref -s --abbrev HEAD)
   github="https://github.com/chef/chef/commit/"
-  if git rebase origin/master >/dev/null; then
-    buildkite-agent annotate --style success --context "rebase-pr-branch-${master}" \
-      "Rebased onto master ([${master}](${github}${master}))."
+  if git rebase origin/main >/dev/null; then
+    buildkite-agent annotate --style success --context "rebase-pr-branch-${main}" \
+      "Rebased onto main ([${main}](${github}${main}))."
   else
     git rebase --abort
-    buildkite-agent annotate --style warning --context "rebase-pr-branch-${master}" \
-      "Couldn't rebase onto master ([${master}](${github}${master})), building PR HEAD ([${pr_head}](${github}${pr_head}))."
+    buildkite-agent annotate --style warning --context "rebase-pr-branch-${main}" \
+      "Couldn't rebase onto main ([${main}](${github}${main})), building PR HEAD ([${pr_head}](${github}${pr_head}))."
   fi
 fi
diff --git a/.expeditor/config.yml b/.expeditor/config.yml
index 8bb4e33944..f8c6e9e778 100644
--- a/.expeditor/config.yml
+++ b/.expeditor/config.yml
@@ -236,10 +236,10 @@ subscriptions:
     actions:
       - bash:.expeditor/update_dep.sh
   # NOTE: The branch of Ohai here needs to be updated when setting up a stable branch of chef/chef
-  - workload: chef/ohai:master_completed:pull_request_merged:chef/ohai:master:*
+  - workload: chef/ohai:main_completed:pull_request_merged:chef/ohai:main:*
     actions:
       - bash:.expeditor/update_bundler_dep.sh
   # NOTE: When the stable branch of chef/chef is being cut you probably want to remove this subscription
-  - workload: chef/chefstyle:master_completed:pull_request_merged:chef/chefstyle:master:*
+  - workload: chef/chefstyle:main_completed:pull_request_merged:chef/chefstyle:main:*
     actions:
       - bash:.expeditor/update_bundler_dep.sh
diff --git a/.expeditor/scripts/install-hab.sh b/.expeditor/scripts/install-hab.sh
index 75e910bfab..aaf2dfee5f 100755
--- a/.expeditor/scripts/install-hab.sh
+++ b/.expeditor/scripts/install-hab.sh
@@ -20,5 +20,5 @@ error () {
 
 echo "--- :habicat: Installing latest version of Habitat"
 rm -rf /hab
-curl https://raw.githubusercontent.com/habitat-sh/habitat/master/components/hab/install.sh | bash -s -- -t "$hab_target"
+curl https://raw.githubusercontent.com/habitat-sh/habitat/main/components/hab/install.sh | bash -s -- -t "$hab_target"
 hab license accept
diff --git a/.expeditor/update_bundler_dep.sh b/.expeditor/update_bundler_dep.sh
index 71575a6c76..375fc3daf0 100755
--- a/.expeditor/update_bundler_dep.sh
+++ b/.expeditor/update_bundler_dep.sh
@@ -24,6 +24,6 @@ git commit --message "Bump $EXPEDITOR_REPO to $EXPEDITOR_LATEST_COMMIT" --messag
 
 open_pull_request "$EXPEDITOR_BRANCH"
 
-# Get back to master and cleanup the leftovers - any changed files left over at the end of this script will get committed to master.
+# Get back to main and cleanup the leftovers - any changed files left over at the end of this script will get committed to main.
 git checkout -
 git branch -D "$branch"
diff --git a/.expeditor/update_dep.sh b/.expeditor/update_dep.sh
index 55258c66f8..5e9125cd04 100755
--- a/.expeditor/update_dep.sh
+++ b/.expeditor/update_dep.sh
@@ -41,6 +41,6 @@ git commit --message "Bump $DEPNAME to $EXPEDITOR_VERSION" --message "This pull
 
 open_pull_request "$EXPEDITOR_BRANCH"
 
-# Get back to master and cleanup the leftovers - any changed files left over at the end of this script will get committed to master.
+# Get back to main and cleanup the leftovers - any changed files left over at the end of this script will get committed to main.
 git checkout -
 git branch -D "$branch"
diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml
index 9e3f0669ab..5bbfb25e9c 100644
--- a/.expeditor/verify.pipeline.yml
+++ b/.expeditor/verify.pipeline.yml
@@ -280,7 +280,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 chef/chef-zero master rake pedant
+    - bundle exec tasks/bin/run_external_test chef/chef-zero main rake pedant
   expeditor:
     executor:
       docker:
@@ -294,7 +294,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 chef/cheffish master rake spec
+    - bundle exec tasks/bin/run_external_test chef/cheffish main rake spec
   expeditor:
     executor:
       docker:
@@ -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 master rake
+    - bundle exec tasks/bin/run_external_test chefspec/chefspec main rake
   expeditor:
     executor:
       docker:
@@ -316,7 +316,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 chef/knife-windows master rake spec
+    - bundle exec tasks/bin/run_external_test chef/knife-windows main rake spec
   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 master rake
+    - bundle exec tasks/bin/run_external_test berkshelf/berkshelf main rake
   expeditor:
     executor:
       docker:
diff --git a/.github/workflows/func_spec.yml b/.github/workflows/func_spec.yml
index 5913fc31f4..70089b4bb1 100644
--- a/.github/workflows/func_spec.yml
+++ b/.github/workflows/func_spec.yml
@@ -5,7 +5,7 @@ name: func_spec
   pull_request:
   push:
     branches:
-      - master
+      - main
 
 jobs:
   choco:
diff --git a/.github/workflows/kitchen.yml b/.github/workflows/kitchen.yml
index 5fa865bb34..09bd3b0cf8 100644
--- a/.github/workflows/kitchen.yml
+++ b/.github/workflows/kitchen.yml
@@ -5,7 +5,7 @@ name: kitchen
   pull_request:
   push:
     branches:
-      - master
+      - main
 
 jobs:
   windows:
@@ -113,7 +113,7 @@ jobs:
       CHEF_LICENSE: accept-no-persist
     steps:
       - name: Check out code
-        uses: actions/checkout@master
+        uses: actions/checkout@main
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 9ea4b32227..1b9daa6aba 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -5,7 +5,7 @@ name: lint
   pull_request:
   push:
     branches:
-      - master
+      - main
 
 jobs:
   chefstyle:
@@ -28,7 +28,7 @@ jobs:
       - uses: carlosperate/download-file-action@v1.0.3
         id: download-custom-dictionary
         with:
-          file-url: 'https://raw.githubusercontent.com/chef/chef_dictionary/master/chef.txt'
+          file-url: 'https://raw.githubusercontent.com/chef/chef_dictionary/main/chef.txt'
           file-name: 'chef_dictionary.txt'
       - uses: zwaldowski/cspell-action@v1
         with:
diff --git a/Gemfile b/Gemfile
index be03e4e48a..8f195b87e4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,7 @@ source "https://rubygems.org"
 
 gem "chef", path: "."
 
-gem "ohai", git: "https://github.com/chef/ohai.git", branch: "master"
+gem "ohai", git: "https://github.com/chef/ohai.git", branch: "main"
 
 gem "chef-utils", path: File.expand_path("chef-utils", __dir__) if File.exist?(File.expand_path("chef-utils", __dir__))
 gem "chef-config", path: File.expand_path("chef-config", __dir__) if File.exist?(File.expand_path("chef-config", __dir__))
@@ -48,7 +48,7 @@ end
 
 group(:chefstyle) do
   # for testing new chefstyle rules
-  gem "chefstyle", git: "https://github.com/chef/chefstyle.git", branch: "master"
+  gem "chefstyle", git: "https://github.com/chef/chefstyle.git", branch: "main"
 end
 
 instance_eval(ENV["GEMFILE_MOD"]) if ENV["GEMFILE_MOD"]
diff --git a/Gemfile.lock b/Gemfile.lock
index 181082f6e3..991a2f2334 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,15 +1,15 @@
 GIT
   remote: https://github.com/chef/chefstyle.git
-  revision: 3ee0e9ee0d9a606c7f15a90e6e2bec3e3d74e073
-  branch: master
+  revision: 55b60964c0fdd289375030d82444fe5dd06ee1b1
+  branch: main
   specs:
     chefstyle (2.0.8)
       rubocop (= 1.19.0)
 
 GIT
   remote: https://github.com/chef/ohai.git
-  revision: 69162f41bd5af837a81a735a7ce091fe4cdfe0f9
-  branch: master
+  revision: de7b4f4349c767120f223b0569687187082ad73c
+  branch: main
   specs:
     ohai (17.3.2)
       chef-config (>= 14.12, < 18)
@@ -322,7 +322,7 @@ GEM
       rubocop-ast (>= 1.9.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.10.0)
+    rubocop-ast (1.11.0)
       parser (>= 3.0.1.1)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
@@ -420,11 +420,9 @@ GEM
     wmi-lite (1.0.5)
 
 PLATFORMS
-  arm64-darwin-20
   ruby
   x64-mingw32
   x86-mingw32
-  x86_64-linux
 
 DEPENDENCIES
   appbundler
@@ -448,4 +446,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.2.22
+   2.2.26