Merge pull request #11187 from chef/m1_16

Produce M1 mac builds and pin win32-certstore

6 files changed, 22 insertions, 20 deletions

diff --git a/.expeditor/release.omnibus.yml b/.expeditor/release.omnibus.yml
index b35e7c565d..2c78fff5d4 100644
--- a/.expeditor/release.omnibus.yml
+++ b/.expeditor/release.omnibus.yml
@@ -41,6 +41,8 @@ builder-to-testers-map:
     - mac_os_x-10.14-x86_64
     - mac_os_x-10.15-x86_64
     - mac_os_x-11.0-x86_64
+  mac_os_x-11-arm64:
+    - mac_os_x-11-arm64
   sles-12-s390x:
     - sles-12-s390x
     - sles-15-s390x
diff --git a/Gemfile.lock b/Gemfile.lock
index 6c9e84ef1e..db8afcf15f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,9 +1,9 @@
 GIT
   remote: https://github.com/chef/ohai.git
-  revision: 4065ba8e773c58bcfb9d3b093a843eaa5bc4fb0a
+  revision: 2573fcf62e2d3fed35536e5fcab314d3ebd375ed
   branch: 16-stable
   specs:
-    ohai (16.10.6)
+    ohai (16.10.7)
       chef-config (>= 12.8, < 17)
       chef-utils (>= 16.0, < 17)
       ffi (~> 1.9)
@@ -96,7 +96,7 @@ PATH
       tty-table (~> 0.11)
       uuidtools (>= 2.1.5, < 3.0)
       win32-api (~> 1.5.3)
-      win32-certstore (~> 0.5)
+      win32-certstore (~> 0.5.0)
       win32-event (~> 0.6.1)
       win32-eventlog (= 0.6.3)
       win32-mmap (~> 0.4.1)
@@ -240,7 +240,7 @@ GEM
       mixlib-log
     mixlib-archive (1.1.7-universal-mingw32)
       mixlib-log
-    mixlib-authentication (3.0.7)
+    mixlib-authentication (3.0.10)
     mixlib-cli (2.1.8)
     mixlib-config (3.0.9)
       tomlrb
@@ -324,16 +324,16 @@ GEM
     rubyzip (2.3.0)
     semverse (3.0.0)
     sslshake (1.3.1)
-    strings (0.2.0)
+    strings (0.2.1)
       strings-ansi (~> 0.2)
-      unicode-display_width (~> 1.5)
+      unicode-display_width (>= 1.5, < 3.0)
       unicode_utils (~> 1.4)
     strings-ansi (0.2.0)
     structured_warnings (0.4.0)
     syslog-logger (1.6.8)
     thor (1.1.0)
     tomlrb (1.3.0)
-    train-core (3.5.2)
+    train-core (3.5.4)
       addressable (~> 2.5)
       ffi (!= 1.13.0)
       json (>= 1.8, < 3.0)
@@ -365,13 +365,13 @@ GEM
     unicode-display_width (1.7.0)
     unicode_utils (1.4.0)
     uuidtools (2.2.0)
-    webmock (3.11.2)
+    webmock (3.12.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
     webrick (1.7.0)
     win32-api (1.5.3-universal-mingw32)
-    win32-certstore (0.6.1)
+    win32-certstore (0.5.3)
       ffi
       mixlib-shellout
     win32-event (0.6.3)
diff --git a/chef-universal-mingw32.gemspec b/chef-universal-mingw32.gemspec
index bfa2fab2a2..018d45d27b 100644
--- a/chef-universal-mingw32.gemspec
+++ b/chef-universal-mingw32.gemspec
@@ -14,7 +14,7 @@ gemspec.add_dependency "win32-service", ">= 2.1.5", "< 3.0"
 gemspec.add_dependency "wmi-lite", "~> 1.0"
 gemspec.add_dependency "win32-taskscheduler", "~> 2.0"
 gemspec.add_dependency "iso8601", ">= 0.12.1", "< 0.14" # validate 0.14 when it comes out
-gemspec.add_dependency "win32-certstore", "~> 0.5" # 0.5+ required for specifying user vs. system store
+gemspec.add_dependency "win32-certstore", "~> 0.5.0" # 0.5+ required for specifying user vs. system store
 gemspec.extensions << "ext/win32-eventlog/Rakefile"
 gemspec.files += Dir.glob("{distro,ext}/**/*")
 
diff --git a/cspell.json b/cspell.json
index a96f5ec54b..fdf9cb3c2a 100644
--- a/cspell.json
+++ b/cspell.json
@@ -664,7 +664,6 @@
     "HRGN",
     "HRSRC",
     "Hsiao",
-    "htop",
     "httpd",
     "Huon",
     "hwaddr",
diff --git a/kitchen-tests/cookbooks/end_to_end/recipes/_packages.rb b/kitchen-tests/cookbooks/end_to_end/recipes/_packages.rb
index 58ede61f52..93a2c4d467 100644
--- a/kitchen-tests/cookbooks/end_to_end/recipes/_packages.rb
+++ b/kitchen-tests/cookbooks/end_to_end/recipes/_packages.rb
@@ -7,7 +7,7 @@
 
 # this is just a list of package that exist on every O/S we test, and often aren't installed by default.  you don't
 # have to get too clever here, you can delete packages if they don't exist everywhere we test.
-pkgs = %w{lsof tcpdump strace zsh dmidecode ltrace bc curl wget subversion traceroute htop tmux }
+pkgs = %w{lsof tcpdump strace zsh dmidecode ltrace bc curl wget subversion traceroute tmux }
 
 # this deliberately calls the multipackage API N times in order to do one package installation in order to exercise the
 # multipackage cookbook.
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 35060f6033..23349077f3 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -32,7 +32,7 @@ GEM
     artifactory (3.0.15)
     awesome_print (1.9.2)
     aws-eventstream (1.1.1)
-    aws-partitions (1.432.0)
+    aws-partitions (1.433.0)
     aws-sdk-core (3.113.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
@@ -252,7 +252,7 @@ GEM
       mixlib-log
     mixlib-archive (1.1.7-universal-mingw32)
       mixlib-log
-    mixlib-authentication (3.0.7)
+    mixlib-authentication (3.0.10)
     mixlib-cli (2.1.8)
     mixlib-config (3.0.9)
       tomlrb
@@ -346,15 +346,16 @@ GEM
       molinillo (~> 0.6)
       semverse (>= 1.1, < 4.0)
     sslshake (1.3.1)
-    strings (0.2.0)
+    strings (0.2.1)
       strings-ansi (~> 0.2)
-      unicode-display_width (~> 1.5)
+      unicode-display_width (>= 1.5, < 3.0)
       unicode_utils (~> 1.4)
     strings-ansi (0.2.0)
     structured_warnings (0.4.0)
     syslog-logger (1.6.8)
-    test-kitchen (2.10.0)
+    test-kitchen (2.11.1)
       bcrypt_pbkdf (~> 1.0)
+      chef-utils (>= 16.4.35)
       ed25519 (~> 1.2)
       license-acceptance (>= 1.0.11, < 3.0)
       mixlib-install (~> 3.6)
@@ -370,7 +371,7 @@ GEM
     toml-rb (2.0.1)
       citrus (~> 3.0, > 3.0)
     tomlrb (1.3.0)
-    train-core (3.5.2)
+    train-core (3.5.4)
       addressable (~> 2.5)
       ffi (!= 1.13.0)
       json (>= 1.8, < 3.0)
@@ -399,12 +400,12 @@ GEM
       pastel (~> 0.8)
       strings (~> 0.2.0)
       tty-screen (~> 0.8)
-    unicode-display_width (1.7.0)
+    unicode-display_width (2.0.0)
     unicode_utils (1.4.0)
     uuidtools (2.2.0)
     webrick (1.7.0)
     win32-api (1.5.3-universal-mingw32)
-    win32-certstore (0.5.3)
+    win32-certstore (0.6.1)
       ffi
       mixlib-shellout
     win32-event (0.6.3)