diff options
| -rw-r--r-- | CHANGELOG.md | 7 | ||||
| -rw-r--r-- | Gemfile.lock | 26 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | chef-bin/lib/chef-bin/version.rb | 2 | ||||
| -rw-r--r-- | chef-config/lib/chef-config/version.rb | 2 | ||||
| -rw-r--r-- | chef-utils/lib/chef-utils/version.rb | 2 | ||||
| -rw-r--r-- | dobi.yaml | 3 | ||||
| -rw-r--r-- | knife/Gemfile.lock | 16 | ||||
| -rw-r--r-- | knife/lib/chef/knife/core/windows_bootstrap_context.rb | 5 | ||||
| -rw-r--r-- | knife/lib/chef/knife/version.rb | 2 | ||||
| -rw-r--r-- | lib/chef/version.rb | 2 | ||||
| -rw-r--r-- | spec/unit/knife/core/windows_bootstrap_context_spec.rb | 6 |
12 files changed, 38 insertions, 37 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 96dec1cd35..1748cf3ab6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,17 +1,18 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> This changelog lists individual merged pull requests to Chef Infra Client and geared towards developers. For a list of significant changes per release see the [Chef Infra Client Release Notes](https://docs.chef.io/release_notes_client/). -<!-- latest_release 17.0.212 --> -## [v17.0.212](https://github.com/chef/chef/tree/v17.0.212) (2021-04-19) +<!-- latest_release 17.0.213 --> +## [v17.0.213](https://github.com/chef/chef/tree/v17.0.213) (2021-04-20) #### Merged Pull Requests -- Update tests to handle local omnibus packages from Buildkite artifacts api [#11382](https://github.com/chef/chef/pull/11382) ([nkierpiec](https://github.com/nkierpiec)) +- Bump chef/ohai to 2a0da607d2d80c74adb9798c3bae1d2702ba05fd [#11399](https://github.com/chef/chef/pull/11399) ([chef-expeditor[bot]](https://github.com/chef-expeditor[bot])) <!-- latest_release --> <!-- release_rollup since=16.8.14 --> ### Changes not yet released to stable #### Merged Pull Requests +- Bump chef/ohai to 2a0da607d2d80c74adb9798c3bae1d2702ba05fd [#11399](https://github.com/chef/chef/pull/11399) ([chef-expeditor[bot]](https://github.com/chef-expeditor[bot])) <!-- 17.0.213 --> - Update tests to handle local omnibus packages from Buildkite artifacts api [#11382](https://github.com/chef/chef/pull/11382) ([nkierpiec](https://github.com/nkierpiec)) <!-- 17.0.212 --> - Bump omnibus-software from `0dcaeb1` to `810a6c4` in /omnibus [#11396](https://github.com/chef/chef/pull/11396) ([dependabot-preview[bot]](https://github.com/dependabot-preview[bot])) <!-- 17.0.211 --> - Bump chef/ohai to 44f23f01752a95b3b93b710f9510806b781f8635 [#11392](https://github.com/chef/chef/pull/11392) ([chef-expeditor[bot]](https://github.com/chef-expeditor[bot])) <!-- 17.0.210 --> diff --git a/Gemfile.lock b/Gemfile.lock index b3820de9e9..3e00a1227f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,10 +8,10 @@ GIT GIT remote: https://github.com/chef/ohai.git - revision: addb3b4e3ba539ee8a5df53e3ff87796d5bf8e2c + revision: e48813786a6dbb80d83cb33de3876d48b6518f28 branch: master specs: - ohai (17.0.37) + ohai (17.0.38) chef-config (>= 12.8, < 18) chef-utils (>= 16.0, < 18) ffi (~> 1.9) @@ -35,11 +35,11 @@ GIT PATH remote: . specs: - chef (17.0.212) + chef (17.0.213) addressable bcrypt_pbkdf (~> 1.1) - chef-config (= 17.0.212) - chef-utils (= 17.0.212) + chef-config (= 17.0.213) + chef-utils (= 17.0.213) chef-vault chef-zero (>= 14.0.11) diff-lcs (>= 1.2.4, < 1.4.0) @@ -71,11 +71,11 @@ PATH tty-screen (~> 0.6) tty-table (~> 0.11) uuidtools (>= 2.1.5, < 3.0) - chef (17.0.212-universal-mingw32) + chef (17.0.213-universal-mingw32) addressable bcrypt_pbkdf (~> 1.1) - chef-config (= 17.0.212) - chef-utils (= 17.0.212) + chef-config (= 17.0.213) + chef-utils (= 17.0.213) chef-vault chef-zero (>= 14.0.11) diff-lcs (>= 1.2.4, < 1.4.0) @@ -122,15 +122,15 @@ PATH PATH remote: chef-bin specs: - chef-bin (17.0.212) - chef (= 17.0.212) + chef-bin (17.0.213) + chef (= 17.0.213) PATH remote: chef-config specs: - chef-config (17.0.212) + chef-config (17.0.213) addressable - chef-utils (= 17.0.212) + chef-utils (= 17.0.213) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) @@ -139,7 +139,7 @@ PATH PATH remote: chef-utils specs: - chef-utils (17.0.212) + chef-utils (17.0.213) GEM remote: https://rubygems.org/ @@ -1 +1 @@ -17.0.212
\ No newline at end of file +17.0.213
\ 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 e9491a9310..0301ef2c49 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 = "17.0.212".freeze + VERSION = "17.0.213".freeze end # diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb index 0e3feb1351..892f529039 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 = "17.0.212".freeze + VERSION = "17.0.213".freeze end diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb index 67c126ce3a..c12e453137 100644 --- a/chef-utils/lib/chef-utils/version.rb +++ b/chef-utils/lib/chef-utils/version.rb @@ -16,5 +16,5 @@ module ChefUtils CHEFUTILS_ROOT = File.expand_path("..", __dir__) - VERSION = "17.0.212" + VERSION = "17.0.213" end @@ -18,4 +18,5 @@ image=chef: CHANNEL: unstable annotations: tags: - - expeditor:final-channel-tags={{major}},{{major}}.{{minor}}
\ No newline at end of file + - expeditor:default-tags={{channel}} + - expeditor:final-channel-tags=latest,{{major}},{{major}}.{{minor}}
\ No newline at end of file diff --git a/knife/Gemfile.lock b/knife/Gemfile.lock index 6560855c44..922b730804 100644 --- a/knife/Gemfile.lock +++ b/knife/Gemfile.lock @@ -28,17 +28,17 @@ GIT PATH remote: ../chef-bin specs: - chef-bin (17.0.212) - chef (= 17.0.212) + chef-bin (17.0.213) + chef (= 17.0.213) PATH remote: .. specs: - chef (17.0.212) + chef (17.0.213) addressable bcrypt_pbkdf (~> 1.1) - chef-config (= 17.0.212) - chef-utils (= 17.0.212) + chef-config (= 17.0.213) + chef-utils (= 17.0.213) chef-vault chef-zero (>= 14.0.11) diff-lcs (>= 1.2.4, < 1.4.0) @@ -74,9 +74,9 @@ PATH PATH remote: /workspace/chef-chef-master/chef-config specs: - chef-config (17.0.212) + chef-config (17.0.213) addressable - chef-utils (= 17.0.212) + chef-utils (= 17.0.213) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) @@ -85,7 +85,7 @@ PATH PATH remote: /workspace/chef-chef-master/chef-utils specs: - chef-utils (17.0.212) + chef-utils (17.0.213) GEM remote: https://rubygems.org/ diff --git a/knife/lib/chef/knife/core/windows_bootstrap_context.rb b/knife/lib/chef/knife/core/windows_bootstrap_context.rb index 0ff209a0b7..2904a231a5 100644 --- a/knife/lib/chef/knife/core/windows_bootstrap_context.rb +++ b/knife/lib/chef/knife/core/windows_bootstrap_context.rb @@ -294,11 +294,10 @@ class Chef "%TEMP%\\#{ChefUtils::Dist::Infra::CLIENT}-latest.msi" end - # Build a URL to query www.chef.io that will redirect to the correct - # Chef Infra msi download. + # Build a URL that will redirect to the correct Chef Infra msi download. def msi_url(machine_os = nil, machine_arch = nil, download_context = nil) if config[:msi_url].nil? || config[:msi_url].empty? - url = "https://www.chef.io/chef/download?p=windows" + url = "https://omnitruck.chef.io/chef/download?p=windows" url += "&pv=#{machine_os}" unless machine_os.nil? url += "&m=#{machine_arch}" unless machine_arch.nil? url += "&DownloadContext=#{download_context}" unless download_context.nil? diff --git a/knife/lib/chef/knife/version.rb b/knife/lib/chef/knife/version.rb index 67778918ab..7067ad6091 100644 --- a/knife/lib/chef/knife/version.rb +++ b/knife/lib/chef/knife/version.rb @@ -17,7 +17,7 @@ class Chef class Knife KNIFE_ROOT = File.expand_path("../..", __dir__) - VERSION = "17.0.212".freeze + VERSION = "17.0.213".freeze end end diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 6d9a62f1b1..5a595ca8a4 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("17.0.212") + VERSION = Chef::VersionString.new("17.0.213") end # diff --git a/spec/unit/knife/core/windows_bootstrap_context_spec.rb b/spec/unit/knife/core/windows_bootstrap_context_spec.rb index 1243dd1559..af656facf0 100644 --- a/spec/unit/knife/core/windows_bootstrap_context_spec.rb +++ b/spec/unit/knife/core/windows_bootstrap_context_spec.rb @@ -204,19 +204,19 @@ describe Chef::Knife::Core::WindowsBootstrapContext do end it "returns a chef.io msi url with minimal url parameters" do - reference_url = "https://www.chef.io/chef/download?p=windows&channel=stable&v=something" + reference_url = "https://omnitruck.chef.io/chef/download?p=windows&channel=stable&v=something" expect(bootstrap_context.msi_url).to eq(reference_url) end it "returns a chef.io msi url with provided url parameters substituted" do - reference_url = "https://www.chef.io/chef/download?p=windows&pv=machine&m=arch&DownloadContext=ctx&channel=stable&v=something" + reference_url = "https://omnitruck.chef.io/chef/download?p=windows&pv=machine&m=arch&DownloadContext=ctx&channel=stable&v=something" expect(bootstrap_context.msi_url("machine", "arch", "ctx")).to eq(reference_url) end context "when a channel is provided in config" do let(:config) { { channel: "current" } } it "returns a chef.io msi url with the requested channel" do - reference_url = "https://www.chef.io/chef/download?p=windows&channel=current&v=something" + reference_url = "https://omnitruck.chef.io/chef/download?p=windows&channel=current&v=something" expect(bootstrap_context.msi_url).to eq(reference_url) end end |