summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.expeditor/config.yml16
-rw-r--r--CHANGELOG.md10
-rw-r--r--Gemfile.lock24
-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--knife/lib/chef/knife/configure.rb2
-rw-r--r--knife/lib/chef/knife/version.rb2
-rw-r--r--lib/chef/version.rb2
-rw-r--r--omnibus/config/projects/chef.rb6
-rw-r--r--omnibus/omnibus-test.ps14
-rw-r--r--omnibus_overrides.rb2
-rw-r--r--spec/support/shared/functional/windows_script.rb4
14 files changed, 47 insertions, 33 deletions
diff --git a/.expeditor/config.yml b/.expeditor/config.yml
index 2409d405c3..d249264afa 100644
--- a/.expeditor/config.yml
+++ b/.expeditor/config.yml
@@ -20,9 +20,15 @@ rubygems:
# At the given time, trigger the following scheduled workloads
# https://expeditor.chef.io/docs/getting-started/subscriptions/#scheduling-workloads
schedules:
- - name: nightly_build
+ - name: nightly_build_main
description: "Run a nightly build in the Buildkite pipeline"
cronline: "0 6 * * *"
+ - name: nightly_build_chef_17
+ description: "Run a nightly build in the Buildkite pipeline"
+ cronline: "30 9 * * 2,4"
+ - name: nightly_build_chef_16
+ description: "Run a nightly build in the Buildkite pipeline"
+ cronline: "30 2 * * 2"
pipelines:
- verify:
@@ -265,6 +271,12 @@ subscriptions:
- workload: ruby_gem_published:train-winrm-*
actions:
- bash:.expeditor/update_dep.sh
- - workload: schedule_triggered:chef/chef-server:main:nightly_build:*
+ - workload: schedule_triggered:chef/chef:main:nightly_build_main:*
+ actions:
+ - trigger_pipeline:omnibus/adhoc
+ - workload: schedule_triggered:chef/chef:chef-17:nightly_build_chef_17:*
+ actions:
+ - trigger_pipeline:omnibus/adhoc
+ - workload: schedule_triggered:chef/chef:chef-16:nightly_build_chef_16:*
actions:
- trigger_pipeline:omnibus/adhoc
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d1ed6c431d..b26dec0805 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,17 +1,21 @@
<!-- 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 18.0.124 -->
-## [v18.0.124](https://github.com/chef/chef/tree/v18.0.124) (2022-06-25)
+<!-- latest_release 18.0.128 -->
+## [v18.0.128](https://github.com/chef/chef/tree/v18.0.128) (2022-07-07)
#### Merged Pull Requests
-- AdHoc Pipeline Windows PageFile Test errors [#13009](https://github.com/chef/chef/pull/13009) ([johnmccrae](https://github.com/johnmccrae))
+- Fix issue in adhoc nightly builds [#13059](https://github.com/chef/chef/pull/13059) ([neha-p6](https://github.com/neha-p6))
<!-- latest_release -->
<!-- release_rollup since=17.9.26 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- Fix issue in adhoc nightly builds [#13059](https://github.com/chef/chef/pull/13059) ([neha-p6](https://github.com/neha-p6)) <!-- 18.0.128 -->
+- Use new msys2 based devkit for windows [#13038](https://github.com/chef/chef/pull/13038) ([mwrock](https://github.com/mwrock)) <!-- 18.0.127 -->
+- Use dist constant when invoking knife configure [#12926](https://github.com/chef/chef/pull/12926) ([ramereth](https://github.com/ramereth)) <!-- 18.0.126 -->
+- Add nightlies for chef-17 to run every Tue, Thu and chef-16 to run every Tue [#13018](https://github.com/chef/chef/pull/13018) ([PrajaktaPurohit](https://github.com/PrajaktaPurohit)) <!-- 18.0.125 -->
- AdHoc Pipeline Windows PageFile Test errors [#13009](https://github.com/chef/chef/pull/13009) ([johnmccrae](https://github.com/johnmccrae)) <!-- 18.0.124 -->
- Fix fedora kitchen test failure [#13020](https://github.com/chef/chef/pull/13020) ([neha-p6](https://github.com/neha-p6)) <!-- 18.0.123 -->
- Refactored tests for older Windows versions [#13019](https://github.com/chef/chef/pull/13019) ([johnmccrae](https://github.com/johnmccrae)) <!-- 18.0.122 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 763f9c7bbf..5b40954d93 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -42,12 +42,12 @@ GIT
PATH
remote: .
specs:
- chef (18.0.124)
+ chef (18.0.128)
addressable
aws-sdk-s3 (~> 1.91)
aws-sdk-secretsmanager (~> 1.46)
- chef-config (= 18.0.124)
- chef-utils (= 18.0.124)
+ chef-config (= 18.0.128)
+ chef-utils (= 18.0.128)
chef-vault
chef-zero (>= 14.0.11)
corefoundation (~> 0.3.4)
@@ -76,13 +76,13 @@ PATH
unf_ext (< 0.0.8.1)
uuidtools (>= 2.1.5, < 3.0)
vault (~> 0.16)
- chef (18.0.124-universal-mingw32)
+ chef (18.0.128-universal-mingw32)
addressable
aws-sdk-s3 (~> 1.91)
aws-sdk-secretsmanager (~> 1.46)
- chef-config (= 18.0.124)
+ chef-config (= 18.0.128)
chef-powershell (~> 1.0.12)
- chef-utils (= 18.0.124)
+ chef-utils (= 18.0.128)
chef-vault
chef-zero (>= 14.0.11)
corefoundation (~> 0.3.4)
@@ -126,15 +126,15 @@ PATH
PATH
remote: chef-bin
specs:
- chef-bin (18.0.124)
- chef (= 18.0.124)
+ chef-bin (18.0.128)
+ chef (= 18.0.128)
PATH
remote: chef-config
specs:
- chef-config (18.0.124)
+ chef-config (18.0.128)
addressable
- chef-utils (= 18.0.124)
+ chef-utils (= 18.0.128)
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
mixlib-shellout (>= 2.0, < 4.0)
@@ -143,7 +143,7 @@ PATH
PATH
remote: chef-utils
specs:
- chef-utils (18.0.124)
+ chef-utils (18.0.128)
concurrent-ruby
GEM
@@ -156,7 +156,7 @@ GEM
mixlib-shellout (>= 2.0, < 4.0)
ast (2.4.2)
aws-eventstream (1.2.0)
- aws-partitions (1.601.0)
+ aws-partitions (1.603.0)
aws-sdk-core (3.131.2)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.525.0)
diff --git a/VERSION b/VERSION
index 759872df52..be701dd746 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-18.0.124 \ No newline at end of file
+18.0.128 \ 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 3eb13734f2..c1e67368b3 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 = "18.0.124".freeze
+ VERSION = "18.0.128".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 06ffd927fc..2374cee49e 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 = "18.0.124".freeze
+ VERSION = "18.0.128".freeze
end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index f9b73168a0..56c57ebf9e 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 = "18.0.124"
+ VERSION = "18.0.128"
end
diff --git a/knife/lib/chef/knife/configure.rb b/knife/lib/chef/knife/configure.rb
index 9c806b4af6..e49a01277c 100644
--- a/knife/lib/chef/knife/configure.rb
+++ b/knife/lib/chef/knife/configure.rb
@@ -138,7 +138,7 @@ class Chef
# @return [String] the path to the user's .chef directory
def chef_config_path
- @chef_config_path ||= ChefConfig::PathHelper.home(".chef")
+ @chef_config_path ||= ChefConfig::PathHelper.home(ChefUtils::Dist::Infra::USER_CONF_DIR)
end
# @return [String] the full path to the config file (credential file)
diff --git a/knife/lib/chef/knife/version.rb b/knife/lib/chef/knife/version.rb
index 709c78e18b..54423bebae 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 = "18.0.124".freeze
+ VERSION = "18.0.128".freeze
end
end
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 8e07067d85..531cb07f31 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("18.0.124")
+ VERSION = Chef::VersionString.new("18.0.128")
end
#
diff --git a/omnibus/config/projects/chef.rb b/omnibus/config/projects/chef.rb
index dd22f4654c..94c0236841 100644
--- a/omnibus/config/projects/chef.rb
+++ b/omnibus/config/projects/chef.rb
@@ -62,11 +62,7 @@ dependency "version-manifest"
dependency "openssl-customization"
# devkit needs to come dead last these days so we do not use it to compile any gems
-if windows?
- override :"ruby-windows-devkit", version: "4.5.2-20111229-1559" if windows_arch_i386?
- dependency "ruby-windows-devkit"
- dependency "ruby-windows-devkit-bash"
-end
+dependency "ruby-msys2-devkit" if windows?
dependency "ruby-cleanup"
diff --git a/omnibus/omnibus-test.ps1 b/omnibus/omnibus-test.ps1
index 3b7c99c434..2c4331ff2f 100644
--- a/omnibus/omnibus-test.ps1
+++ b/omnibus/omnibus-test.ps1
@@ -69,7 +69,9 @@ If ($lastexitcode -ne 0) { Throw $lastexitcode }
& $embedded_bin_dir\rspec.bat --version
If ($lastexitcode -ne 0) { Throw $lastexitcode }
-$Env:PATH = "C:\opscode\chef\bin;C:\opscode\chef\embedded\bin;$Env:PATH"
+# We add C:\Program Files\Git\bin to the path to ensure the git bash shell is included
+# Omnibus puts C:\Program Files\Git\mingw64\bin which has git.exe but not bash.exe
+$Env:PATH = "C:\opscode\chef\bin;C:\opscode\chef\embedded\bin;C:\Program Files\Git\bin;$Env:PATH"
# Test against the vendored chef gem (cd into the output of "gem which chef")
$chefdir = gem which chef
diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb
index b0a85b5b34..af1f086ba8 100644
--- a/omnibus_overrides.rb
+++ b/omnibus_overrides.rb
@@ -21,7 +21,7 @@ override "nokogiri", version: "1.13.1"
override "openssl", version: mac_os_x? ? "1.1.1m" : "1.0.2zb"
override "pkg-config-lite", version: "0.28-1"
override "ruby", version: "3.0.3"
-override "ruby-windows-devkit-bash", version: "3.1.23-4-msys-1.0.18"
+override "ruby-msys2-devkit", version: "3.0.3-1"
override "util-macros", version: "1.19.0"
override "xproto", version: "7.0.28"
override "zlib", version: "1.2.11"
diff --git a/spec/support/shared/functional/windows_script.rb b/spec/support/shared/functional/windows_script.rb
index 151ad2387c..1db85e35f5 100644
--- a/spec/support/shared/functional/windows_script.rb
+++ b/spec/support/shared/functional/windows_script.rb
@@ -163,7 +163,7 @@ shared_context Chef::Resource::WindowsScript do
describe "when the run action is invoked on Windows" do
it "executes the script code" do
- resource.code("whoami > \"#{script_output_path}\"")
+ resource.code("chcp > \"#{script_output_path}\"")
resource.returns(0)
resource.run_action(:run)
end
@@ -199,7 +199,7 @@ shared_context Chef::Resource::WindowsScript do
end
it "executes the script code" do
- resource.code("whoami > \"#{script_output_path}\"")
+ resource.code("chcp > \"#{script_output_path}\"")
resource.returns(0)
resource.run_action(:run)
end
View Lorry Controller Status