summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.expeditor/release.omnibus.yml1
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock22
-rw-r--r--VERSION2
-rw-r--r--chef-bin/lib/chef-bin/version.rb2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--chef-utils/lib/chef-utils/version.rb2
-rw-r--r--lib/chef/version.rb2
-rw-r--r--spec/functional/resource/user/dscl_spec.rb2
-rw-r--r--spec/functional/resource/user/mac_user_spec.rb2
-rw-r--r--spec/spec_helper.rb3
-rw-r--r--spec/support/platform_helpers.rb14
12 files changed, 30 insertions, 31 deletions
diff --git a/.expeditor/release.omnibus.yml b/.expeditor/release.omnibus.yml
index 9b455c3919..0d8a21dd3c 100644
--- a/.expeditor/release.omnibus.yml
+++ b/.expeditor/release.omnibus.yml
@@ -40,6 +40,7 @@ builder-to-testers-map:
- mac_os_x-10.13-x86_64
- mac_os_x-10.14-x86_64
- mac_os_x-10.15-x86_64
+ - mac_os_x-11.0-x86_64
sles-12-s390x:
- sles-12-s390x
sles-12-x86_64:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 16f57fda03..78d15e693b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 16.5.8 -->
-## [v16.5.8](https://github.com/chef/chef/tree/v16.5.8) (2020-08-24)
+<!-- latest_release 16.5.9 -->
+## [v16.5.9](https://github.com/chef/chef/tree/v16.5.9) (2020-08-25)
#### Merged Pull Requests
-- separate omnibus rspec path from options [#10343](https://github.com/chef/chef/pull/10343) ([mwrock](https://github.com/mwrock))
+- Add macOS 11.0 (Big Sur) packages [#10332](https://github.com/chef/chef/pull/10332) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=16.4.41 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- Add macOS 11.0 (Big Sur) packages [#10332](https://github.com/chef/chef/pull/10332) ([tas50](https://github.com/tas50)) <!-- 16.5.9 -->
- separate omnibus rspec path from options [#10343](https://github.com/chef/chef/pull/10343) ([mwrock](https://github.com/mwrock)) <!-- 16.5.8 -->
- Start building S390x packages again [#10338](https://github.com/chef/chef/pull/10338) ([btm](https://github.com/btm)) <!-- 16.5.7 -->
- Avoid knife ssh freeze on windows [#9482](https://github.com/chef/chef/pull/9482) ([dheerajd-msys](https://github.com/dheerajd-msys)) <!-- 16.5.6 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 82a3ad27be..f52a5f13a4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,12 +27,12 @@ GIT
PATH
remote: .
specs:
- chef (16.5.8)
+ chef (16.5.9)
addressable
bcrypt_pbkdf (= 1.1.0.rc1)
bundler (>= 1.10)
- chef-config (= 16.5.8)
- chef-utils (= 16.5.8)
+ chef-config (= 16.5.9)
+ chef-utils (= 16.5.9)
chef-vault
chef-zero (>= 14.0.11)
diff-lcs (>= 1.2.4, < 1.4.0)
@@ -62,12 +62,12 @@ PATH
tty-prompt (~> 0.21)
tty-screen (~> 0.6)
uuidtools (~> 2.1.5)
- chef (16.5.8-universal-mingw32)
+ chef (16.5.9-universal-mingw32)
addressable
bcrypt_pbkdf (= 1.1.0.rc1)
bundler (>= 1.10)
- chef-config (= 16.5.8)
- chef-utils (= 16.5.8)
+ chef-config (= 16.5.9)
+ chef-utils (= 16.5.9)
chef-vault
chef-zero (>= 14.0.11)
diff-lcs (>= 1.2.4, < 1.4.0)
@@ -112,15 +112,15 @@ PATH
PATH
remote: chef-bin
specs:
- chef-bin (16.5.8)
- chef (= 16.5.8)
+ chef-bin (16.5.9)
+ chef (= 16.5.9)
PATH
remote: chef-config
specs:
- chef-config (16.5.8)
+ chef-config (16.5.9)
addressable
- chef-utils (= 16.5.8)
+ chef-utils (= 16.5.9)
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
mixlib-shellout (>= 2.0, < 4.0)
@@ -129,7 +129,7 @@ PATH
PATH
remote: chef-utils
specs:
- chef-utils (16.5.8)
+ chef-utils (16.5.9)
GEM
remote: https://rubygems.org/
diff --git a/VERSION b/VERSION
index 088c805bcc..0b36bd41f2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.5.8 \ No newline at end of file
+16.5.9 \ No newline at end of file
diff --git a/chef-bin/lib/chef-bin/version.rb b/chef-bin/lib/chef-bin/version.rb
index 1feb064907..e38cb84690 100644
--- a/chef-bin/lib/chef-bin/version.rb
+++ b/chef-bin/lib/chef-bin/version.rb
@@ -21,7 +21,7 @@
module ChefBin
CHEFBIN_ROOT = File.expand_path("..", __dir__)
- VERSION = "16.5.8".freeze
+ VERSION = "16.5.9".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index e29472df4e..3e3f10a292 100644
--- a/chef-config/lib/chef-config/version.rb
+++ b/chef-config/lib/chef-config/version.rb
@@ -15,5 +15,5 @@
module ChefConfig
CHEFCONFIG_ROOT = File.expand_path("..", __dir__)
- VERSION = "16.5.8".freeze
+ VERSION = "16.5.9".freeze
end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index 894fdbb3d3..f0b324bd46 100644
--- a/chef-utils/lib/chef-utils/version.rb
+++ b/chef-utils/lib/chef-utils/version.rb
@@ -15,5 +15,5 @@
module ChefUtils
CHEFUTILS_ROOT = File.expand_path("..", __dir__)
- VERSION = "16.5.8".freeze
+ VERSION = "16.5.9".freeze
end
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 1911036ec0..d59d44e836 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -23,7 +23,7 @@ require_relative "version_string"
class Chef
CHEF_ROOT = File.expand_path("..", __dir__)
- VERSION = Chef::VersionString.new("16.5.8")
+ VERSION = Chef::VersionString.new("16.5.9")
end
#
diff --git a/spec/functional/resource/user/dscl_spec.rb b/spec/functional/resource/user/dscl_spec.rb
index 462e4aaa0b..50da812b0f 100644
--- a/spec/functional/resource/user/dscl_spec.rb
+++ b/spec/functional/resource/user/dscl_spec.rb
@@ -19,7 +19,7 @@ require "spec_helper"
require "chef/mixin/shell_out"
metadata = {
- macos_only: true,
+ macos_1013: true,
requires_root: true,
}
diff --git a/spec/functional/resource/user/mac_user_spec.rb b/spec/functional/resource/user/mac_user_spec.rb
index f383140d0a..dabc303afb 100644
--- a/spec/functional/resource/user/mac_user_spec.rb
+++ b/spec/functional/resource/user/mac_user_spec.rb
@@ -19,7 +19,7 @@ require "spec_helper"
require "chef/mixin/shell_out"
metadata = {
- macos_1014: true,
+ macos_gte_1014: true,
requires_root: true,
}
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index f497350e97..5766af8954 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -143,7 +143,8 @@ RSpec.configure do |config|
config.filter_run_excluding not_supported_on_windows: true if windows?
config.filter_run_excluding not_supported_on_macos: true if macos?
config.filter_run_excluding macos_only: true unless macos?
- config.filter_run_excluding macos_1014: true unless macos_1014?
+ config.filter_run_excluding macos_1013: true unless macos_1013?
+ config.filter_run_excluding macos_gte_1014: true unless macos_gte_1014?
config.filter_run_excluding not_supported_on_aix: true if aix?
config.filter_run_excluding not_supported_on_solaris: true if solaris?
config.filter_run_excluding not_supported_on_gce: true if gce?
diff --git a/spec/support/platform_helpers.rb b/spec/support/platform_helpers.rb
index 6298e4440d..d4bd0701d8 100644
--- a/spec/support/platform_helpers.rb
+++ b/spec/support/platform_helpers.rb
@@ -3,7 +3,6 @@ require "chef/mixin/shell_out"
require "ohai/mixin/http_helper"
require "ohai/mixin/gce_metadata"
require "chef/mixin/powershell_out"
-require "chef/version_class"
class ShellHelpers
extend Chef::Mixin::ShellOut
@@ -95,13 +94,12 @@ def windows_user_right?(right)
Chef::ReservedNames::Win32::Security.get_account_right(ENV["USERNAME"]).include?(right)
end
-def macos_1014?
- if macos?
- ver = Chef::Version.new(ohai[:platform_version])
- return ver.major == 10 && ver.minor == 14
- end
+def macos_1013?
+ macos? && Gem::Requirement.new("~> 10.13.0").satisfied_by?(Gem::Version.new(ohai[:platform_version]))
+end
- false
+def macos_gte_1014?
+ macos? && Gem::Requirement.new(">= 10.14").satisfied_by?(Gem::Version.new(ohai[:platform_version]))
end
# detects if the hardware is 64-bit (evaluates to true in "WOW64" mode in a 32-bit app on a 64-bit system)
@@ -114,8 +112,6 @@ def windows32?
windows? && !windows64?
end
-# def jruby?
-
def unix?
!windows?
end
View Lorry Controller Status