Merge branch 'chef-17' into expeditor/_train-core_3.10.7expeditor/_train-core_3.10.7

12 files changed, 51 insertions, 49 deletions

diff --git a/.expeditor/scripts/bk_win_functional.ps1 b/.expeditor/scripts/bk_win_functional.ps1
index 8b4a445b44..a2f93378dd 100644
--- a/.expeditor/scripts/bk_win_functional.ps1
+++ b/.expeditor/scripts/bk_win_functional.ps1
@@ -11,7 +11,7 @@ Write-Output "--- Enable Ruby 2.7"
 
 Write-Output "Register Installed Ruby Version 2.7 With Uru"
 Start-Process "uru_rt.exe" -ArgumentList 'admin add C:\ruby27\bin' -Wait
-uru 271
+uru 27
 if (-not $?) { throw "Can't Activate Ruby. Did Uru Registration Succeed?" }
 ruby -v
 if (-not $?) { throw "Can't run Ruby. Is it installed?" }
diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml
index f0e2b3183c..0f1c66abbe 100644
--- a/.expeditor/verify.pipeline.yml
+++ b/.expeditor/verify.pipeline.yml
@@ -175,6 +175,7 @@ steps:
 
 - label: "Integration openSUSE 15 :ruby: 3.0"
   commands:
+    - zypper addrepo --check --priority 50 --refresh --name "Chefzypper-repo" "https://mirror.fcix.net/opensuse/distribution/leap/15.3/repo/oss/" "chefzypper"
     - /workdir/.expeditor/scripts/bk_container_prep.sh
     - zypper install -y cron insserv-compat
     - cd /workdir; bundle config set --local without omnibus_package
@@ -189,6 +190,7 @@ steps:
 
 - label: "Functional openSUSE 15 :ruby: 3.0"
   commands:
+    - zypper addrepo --check --priority 50 --refresh --name "Chefzypper-repo" "https://mirror.fcix.net/opensuse/distribution/leap/15.3/repo/oss/" "chefzypper"
     - /workdir/.expeditor/scripts/bk_container_prep.sh
     - zypper install -y cronie insserv-compat
     - zypper install -y libarchive-devel
@@ -204,6 +206,7 @@ steps:
 
 - label: "Unit openSUSE 15 :ruby: 3.0"
   commands:
+    - zypper addrepo --check --priority 50 --refresh --name "Chefzypper-repo" "https://mirror.fcix.net/opensuse/distribution/leap/15.3/repo/oss/" "chefzypper"
     - /workdir/.expeditor/scripts/bk_container_prep.sh
     - zypper install -y cron insserv-compat libarchive-devel
     - bundle config set --local without omnibus_package
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a6a1759d89..7476660c66 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,17 +1,22 @@
 <!-- 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.10.20 -->
-## [v17.10.20](https://github.com/chef/chef/tree/v17.10.20) (2022-10-12)
+<!-- latest_release 17.10.25 -->
+## [v17.10.25](https://github.com/chef/chef/tree/v17.10.25) (2022-10-21)
 
 #### Merged Pull Requests
-- Update self-signed.badssl.com cert for chef-17 [#13231](https://github.com/chef/chef/pull/13231) ([blabade](https://github.com/blabade))
+- Bump omnibus from `83d8428` to `d1fe3bb` in /omnibus [#13274](https://github.com/chef/chef/pull/13274) ([dependabot[bot]](https://github.com/dependabot[bot]))
 <!-- latest_release -->
 
 <!-- release_rollup since=17.10.0 -->
 ### Changes not yet released to stable
 
 #### Merged Pull Requests
+- Bump omnibus from `83d8428` to `d1fe3bb` in /omnibus [#13274](https://github.com/chef/chef/pull/13274) ([dependabot[bot]](https://github.com/dependabot[bot])) <!-- 17.10.25 -->
+- [Chef-17] Backporting the fix from Chef-18 to get uru to work correctly [#13261](https://github.com/chef/chef/pull/13261) ([johnmccrae](https://github.com/johnmccrae)) <!-- 17.10.24 -->
+- [Chef-17] Backporting a fix for the Linux testers that fixes a resolver_conf issue [#13257](https://github.com/chef/chef/pull/13257) ([johnmccrae](https://github.com/johnmccrae)) <!-- 17.10.23 -->
+- [Chef-17] Backporting a fix for the Linux testers that fixes an issue with nscd… [#13258](https://github.com/chef/chef/pull/13258) ([johnmccrae](https://github.com/johnmccrae)) <!-- 17.10.22 -->
+- [Chef-17] Adding a new Zypper repo with a higher priority [#13255](https://github.com/chef/chef/pull/13255) ([johnmccrae](https://github.com/johnmccrae)) <!-- 17.10.21 -->
 - Update self-signed.badssl.com cert for chef-17 [#13231](https://github.com/chef/chef/pull/13231) ([blabade](https://github.com/blabade)) <!-- 17.10.20 -->
 - Backport to 17: Stop executing locale-gen on every chef run [#12905](https://github.com/chef/chef/pull/12905) ([hrak](https://github.com/hrak)) <!-- 17.10.19 -->
 - backport-17: Fix error &#39;error validating X-Vault-AWS-IAM-Server-ID header: missing header X-Vault-AWS-IAM-Server-ID&#39; in Hashi Vault secret manager for AWS IAM auth method  [#12957](https://github.com/chef/chef/pull/12957) ([neha-p6](https://github.com/neha-p6)) <!-- 17.10.18 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index c3224e9b9f..b38bd9385e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -35,12 +35,12 @@ GIT
 PATH
   remote: .
   specs:
-    chef (17.10.20)
+    chef (17.10.25)
       addressable
       aws-sdk-s3 (~> 1.91)
       aws-sdk-secretsmanager (~> 1.46)
-      chef-config (= 17.10.20)
-      chef-utils (= 17.10.20)
+      chef-config (= 17.10.25)
+      chef-utils (= 17.10.25)
       chef-vault
       chef-zero (>= 14.0.11)
       corefoundation (~> 0.3.4)
@@ -66,13 +66,13 @@ PATH
       train-winrm (>= 0.2.5)
       uuidtools (>= 2.1.5, < 3.0)
       vault (~> 0.16)
-    chef (17.10.20-universal-mingw32)
+    chef (17.10.25-universal-mingw32)
       addressable
       aws-sdk-s3 (~> 1.91)
       aws-sdk-secretsmanager (~> 1.46)
-      chef-config (= 17.10.20)
+      chef-config (= 17.10.25)
       chef-powershell (~> 1.0.12)
-      chef-utils (= 17.10.20)
+      chef-utils (= 17.10.25)
       chef-vault
       chef-zero (>= 14.0.11)
       corefoundation (~> 0.3.4)
@@ -113,15 +113,15 @@ PATH
 PATH
   remote: chef-bin
   specs:
-    chef-bin (17.10.20)
-      chef (= 17.10.20)
+    chef-bin (17.10.25)
+      chef (= 17.10.25)
 
 PATH
   remote: chef-config
   specs:
-    chef-config (17.10.20)
+    chef-config (17.10.25)
       addressable
-      chef-utils (= 17.10.20)
+      chef-utils (= 17.10.25)
       fuzzyurl
       mixlib-config (>= 2.2.12, < 4.0)
       mixlib-shellout (>= 2.0, < 4.0)
@@ -130,7 +130,7 @@ PATH
 PATH
   remote: chef-utils
   specs:
-    chef-utils (17.10.20)
+    chef-utils (17.10.25)
       concurrent-ruby
 
 GEM
@@ -143,8 +143,8 @@ GEM
       mixlib-shellout (>= 2.0, < 4.0)
     ast (2.4.2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.647.0)
-    aws-sdk-core (3.161.0)
+    aws-partitions (1.649.0)
+    aws-sdk-core (3.163.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
@@ -152,7 +152,7 @@ GEM
     aws-sdk-kms (1.58.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.114.0)
+    aws-sdk-s3 (1.115.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
diff --git a/VERSION b/VERSION
index b948d97d34..fc50eb705d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-17.10.20
\ No newline at end of file
+17.10.25
\ 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 7fcce3fbab..1aeaaca197 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.10.20".freeze
+  VERSION = "17.10.25".freeze
 end
 
 #
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index beb36c54ee..6b1d09da1a 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.10.20".freeze
+  VERSION = "17.10.25".freeze
 end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index b02e547f4b..53f9da0374 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.10.20"
+  VERSION = "17.10.25"
 end
diff --git a/kitchen-tests/cookbooks/end_to_end/recipes/linux.rb b/kitchen-tests/cookbooks/end_to_end/recipes/linux.rb
index c08bc4ee2e..9f452c00dc 100644
--- a/kitchen-tests/cookbooks/end_to_end/recipes/linux.rb
+++ b/kitchen-tests/cookbooks/end_to_end/recipes/linux.rb
@@ -43,6 +43,7 @@ include_recipe "ntp" unless fedora? # fedora 34+ doesn't have NTP
 resolver_config "/etc/resolv.conf" do
   nameservers [ "8.8.8.8", "8.8.4.4" ]
   search [ "chef.io" ]
+  atomic_update false # otherwise EBUSY for linux docker containers
 end
 
 users_from_databag = search("users", "*:*")
@@ -57,7 +58,7 @@ ssh_known_hosts_entry "github.com"
 
 include_recipe "openssh"
 
-include_recipe "nscd"
+include_recipe "nscd" unless fedora? # fedora 34+ doesn't have nscd
 
 logrotate_package "logrotate"
 
diff --git a/knife/lib/chef/knife/version.rb b/knife/lib/chef/knife/version.rb
index 22ec8ac070..464c7b58b8 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.10.20".freeze
+    VERSION = "17.10.25".freeze
   end
 end
 
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 02c04c2ad3..557ef1a40a 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.10.20")
+  VERSION = Chef::VersionString.new("17.10.25")
 end
 
 #
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index bacbcbffbd..487cf46dce 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -8,10 +8,10 @@ GIT
 
 GIT
   remote: https://github.com/chef/omnibus.git
-  revision: 83d8428abde4cb289a161f736822ba02563a884c
+  revision: d1fe3bbba0bf8c6cbc0e9d75bfcc8216e4345078
   branch: main
   specs:
-    omnibus (9.0.3)
+    omnibus (9.0.8)
       aws-sdk-s3 (~> 1)
       chef-cleanroom (~> 1.0)
       chef-utils (>= 15.4)
@@ -29,32 +29,30 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
     artifactory (3.0.15)
     awesome_print (1.9.2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.590.0)
-    aws-sdk-core (3.131.1)
+    aws-partitions (1.648.0)
+    aws-sdk-core (3.162.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.57.0)
+    aws-sdk-kms (1.58.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.114.0)
+    aws-sdk-s3 (1.115.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
     aws-sdk-secretsmanager (1.61.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.5.0)
+    aws-sigv4 (1.5.2)
       aws-eventstream (~> 1, >= 1.0.2)
     bcrypt_pbkdf (1.1.0)
-    bcrypt_pbkdf (1.1.0-x64-mingw32)
-    bcrypt_pbkdf (1.1.0-x86-mingw32)
     berkshelf (8.0.1)
       chef (>= 15.7.32)
       chef-config
@@ -248,7 +246,7 @@ GEM
       tomlrb (>= 1.2, < 3.0)
       tty-box (~> 0.6)
       tty-prompt (~> 0.20)
-    license_scout (1.3.1)
+    license_scout (1.3.2)
       ffi-yajl (~> 2.2)
       mixlib-shellout (>= 2.2, < 4.0)
       toml-rb (>= 1, < 3)
@@ -264,7 +262,7 @@ GEM
       mixlib-log
     mixlib-authentication (3.0.10)
     mixlib-cli (2.1.8)
-    mixlib-config (3.0.9)
+    mixlib-config (3.0.27)
       tomlrb
     mixlib-install (3.12.16)
       mixlib-shellout
@@ -278,15 +276,10 @@ GEM
       ffi-win32-extensions (~> 1.0.3)
       win32-process (~> 0.9)
       wmi-lite (~> 1.0)
-    mixlib-shellout (3.2.7-x64-mingw-ucrt)
-      chef-utils
-      ffi-win32-extensions (~> 1.0.3)
-      win32-process (~> 0.9)
-      wmi-lite (~> 1.0)
     mixlib-versioning (1.2.12)
     molinillo (0.8.0)
     multi_json (1.15.0)
-    multipart-post (2.1.1)
+    multipart-post (2.2.3)
     net-scp (3.0.0)
       net-ssh (>= 2.6.5, < 7.0.0)
     net-sftp (3.0.0)
@@ -326,7 +319,7 @@ GEM
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (4.0.7)
+    public_suffix (5.0.0)
     rack (2.2.3)
     rainbow (3.1.1)
     retryable (3.0.5)
@@ -381,16 +374,16 @@ GEM
       winrm-elevated (~> 1.0)
       winrm-fs (~> 1.1)
     thor (1.2.1)
-    toml-rb (2.1.2)
+    toml-rb (2.2.0)
       citrus (~> 3.0, > 3.0)
     tomlrb (1.3.0)
-    train-core (3.9.2)
+    train-core (3.10.7)
       addressable (~> 2.5)
       ffi (!= 1.13.0)
       json (>= 1.8, < 3.0)
       mixlib-shellout (>= 2.0, < 4.0)
-      net-scp (>= 1.2, < 4.0)
-      net-ssh (>= 2.9, < 7.0)
+      net-scp (>= 1.2, < 5.0)
+      net-ssh (>= 2.9, < 8.0)
     train-winrm (0.2.13)
       winrm (>= 2.3.6, < 3.0)
       winrm-elevated (~> 1.2.2)