summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.expeditor/verify.pipeline.yml3
-rw-r--r--CHANGELOG.md9
-rw-r--r--Gemfile.lock28
-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--kitchen-tests/cookbooks/end_to_end/recipes/linux.rb3
-rw-r--r--knife/lib/chef/knife/version.rb2
-rw-r--r--lib/chef/version.rb2
10 files changed, 31 insertions, 24 deletions
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..350e4aa02e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,17 +1,20 @@
<!-- 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.23 -->
+## [v17.10.23](https://github.com/chef/chef/tree/v17.10.23) (2022-10-20)
#### 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))
+- [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))
<!-- latest_release -->
<!-- release_rollup since=17.10.0 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- [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 445053b261..77faca1092 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -35,12 +35,12 @@ GIT
PATH
remote: .
specs:
- chef (17.10.20)
+ chef (17.10.23)
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.23)
+ chef-utils (= 17.10.23)
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.23-universal-mingw32)
addressable
aws-sdk-s3 (~> 1.91)
aws-sdk-secretsmanager (~> 1.46)
- chef-config (= 17.10.20)
+ chef-config (= 17.10.23)
chef-powershell (~> 1.0.12)
- chef-utils (= 17.10.20)
+ chef-utils (= 17.10.23)
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.23)
+ chef (= 17.10.23)
PATH
remote: chef-config
specs:
- chef-config (17.10.20)
+ chef-config (17.10.23)
addressable
- chef-utils (= 17.10.20)
+ chef-utils (= 17.10.23)
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.23)
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.644.0)
- aws-sdk-core (3.159.0)
+ 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)
@@ -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..778bb01f94 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-17.10.20 \ No newline at end of file
+17.10.23 \ 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..7a7c3a636a 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.23".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index beb36c54ee..cd75bc7d0e 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.23".freeze
end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index b02e547f4b..068d00513d 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.23"
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..7895d5efe4 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.23".freeze
end
end
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 02c04c2ad3..4fa5e0221c 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.23")
end
#
View Lorry Controller Status