From 9f944c1c878cda69c298684efe8dbb5cf8d7c27b Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Mon, 18 Sep 2023 13:36:30 +0530 Subject: [PATCH 01/21] removed ruby 2.6 pipeline Signed-off-by: nikhil2611 --- .expeditor/verify.pipeline.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index 8e676b2..c5f81d1 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -11,13 +11,6 @@ expeditor: steps: -- label: run-specs-ruby-2.6 - command: - - .expeditor/run_linux_tests.sh rake - expeditor: - executor: - docker: - image: ruby:2.6 - label: run-specs-ruby-2.7 command: - .expeditor/run_linux_tests.sh rake From 2c5fa1323341aa8acab1fa1f7484c043ad23d49c Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Mon, 18 Sep 2023 14:03:16 +0530 Subject: [PATCH 02/21] updated ruby version Signed-off-by: nikhil2611 --- chef-vault.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chef-vault.gemspec b/chef-vault.gemspec index 57e0818..6bfeae6 100644 --- a/chef-vault.gemspec +++ b/chef-vault.gemspec @@ -31,5 +31,5 @@ Gem::Specification.new do |s| s.bindir = "bin" s.executables = %w{ chef-vault } - s.required_ruby_version = ">= 2.6" + s.required_ruby_version = ">= 2.7" end From 5db774f769a09cf904e9ee0a7f64adb30b4f3692 Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Mon, 18 Sep 2023 18:03:00 +0530 Subject: [PATCH 03/21] updated aruba version Signed-off-by: nikhil2611 --- Gemfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 9df4beb..8d6df66 100644 --- a/Gemfile +++ b/Gemfile @@ -9,14 +9,14 @@ group :development do if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("3.0.0") gem "chef-zero" gem "rspec", "~> 3.4" - gem "aruba", "~> 0.6" + gem "aruba", "~> 2.2" gem "chef", "~> 14.0" gem "chef-utils", "17.10.0" # pin until we drop ruby 2.5 else gem "chef-zero", ">= 15.0.4" gem "chef", "~> 17.0" gem "rspec", "~> 3.10.0" - gem "aruba", "~> 1.1" + gem "aruba", "~> 2.2" gem "knife", "~> 17.0" gem "chef-utils", "17.10.0" # pin until we drop ruby >=3 end From 8134dd57932815431231010401d90e5501d8cc52 Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Mon, 18 Sep 2023 21:31:14 +0530 Subject: [PATCH 04/21] update user tag Signed-off-by: nikhil2611 --- .expeditor/verify.pipeline.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index c5f81d1..4142f81 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -42,7 +42,6 @@ steps: host_os: windows shell: ["powershell", "-Command"] image: rubydistros/windows-2019:3.0 - user: 'NT AUTHORITY\SYSTEM' - label: run-specs-ruby-3.1-windows command: @@ -53,4 +52,3 @@ steps: host_os: windows shell: ["powershell", "-Command"] image: rubydistros/windows-2019:3.1 - user: 'NT AUTHORITY\SYSTEM' From 1883c3657bfb1d876f5b27d0ddf5c0c25f6901ad Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Tue, 19 Sep 2023 00:58:41 +0530 Subject: [PATCH 05/21] update some gems Signed-off-by: nikhil2611 --- Gemfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 8d6df66..81f9f39 100644 --- a/Gemfile +++ b/Gemfile @@ -14,11 +14,11 @@ group :development do gem "chef-utils", "17.10.0" # pin until we drop ruby 2.5 else gem "chef-zero", ">= 15.0.4" - gem "chef", "~> 17.0" - gem "rspec", "~> 3.10.0" + gem "chef", "~> 18.0" + gem "rspec", "~> 3.11" gem "aruba", "~> 2.2" - gem "knife", "~> 17.0" - gem "chef-utils", "17.10.0" # pin until we drop ruby >=3 + gem "knife", "~> 18.0" + gem "chef-utils", ">= 18.2" # pin until we drop ruby >=3 end end From ca6655553d1cad39150ec175ab9b4b96a908971c Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Wed, 20 Sep 2023 09:53:45 +0530 Subject: [PATCH 06/21] update some gems Signed-off-by: nikhil2611 --- Gemfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 81f9f39..896afa9 100644 --- a/Gemfile +++ b/Gemfile @@ -14,11 +14,11 @@ group :development do gem "chef-utils", "17.10.0" # pin until we drop ruby 2.5 else gem "chef-zero", ">= 15.0.4" - gem "chef", "~> 18.0" + gem "chef", "~> 17.0" gem "rspec", "~> 3.11" gem "aruba", "~> 2.2" - gem "knife", "~> 18.0" - gem "chef-utils", ">= 18.2" # pin until we drop ruby >=3 + gem "knife", "~> 17.0" + gem "chef-utils", "17.10.0" # pin until we drop ruby >=3 end end From f9f8f5b4867cb98e3ea8919a9c1e82494089c585 Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Wed, 20 Sep 2023 11:20:28 +0530 Subject: [PATCH 07/21] update some gems Signed-off-by: nikhil2611 --- .expeditor/run_windows_tests.ps1 | 5 +++++ .expeditor/verify.pipeline.yml | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/.expeditor/run_windows_tests.ps1 b/.expeditor/run_windows_tests.ps1 index ffc1d42..3cce207 100644 --- a/.expeditor/run_windows_tests.ps1 +++ b/.expeditor/run_windows_tests.ps1 @@ -1,8 +1,13 @@ # Stop script execution when a non-terminating error occurs $ErrorActionPreference = "Stop" + # This will run ruby test on windows platform Write-Output "--- Bundle install" +ruby --version +bundler --version +gem update --system +If ($lastexitcode -ne 0) { Exit $lastexitcode } bundle config --local path vendor/bundle If ($lastexitcode -ne 0) { Exit $lastexitcode } diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index 4142f81..7b9af24 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -36,19 +36,27 @@ steps: - label: run-specs-ruby-3.0-windows command: - .expeditor/run_windows_tests.ps1 + timeout_in_minutes: 20 expeditor: executor: docker: host_os: windows shell: ["powershell", "-Command"] image: rubydistros/windows-2019:3.0 + user: 'NT AUTHORITY\SYSTEM' + environment: + - FORCE_FFI_YAJL=ext + - EXPIRE_CACHE=true + - CHEF_LICENSE=accept-no-persist - label: run-specs-ruby-3.1-windows command: - .expeditor/run_windows_tests.ps1 + timeout_in_minutes: 20 expeditor: executor: docker: host_os: windows shell: ["powershell", "-Command"] image: rubydistros/windows-2019:3.1 + user: 'NT AUTHORITY\SYSTEM' From 7fa5f6558259e3d6949fc03226dd21653d504786 Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Wed, 20 Sep 2023 13:01:03 +0530 Subject: [PATCH 08/21] update aruba version Signed-off-by: nikhil2611 --- Gemfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 896afa9..56d30db 100644 --- a/Gemfile +++ b/Gemfile @@ -9,14 +9,14 @@ group :development do if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("3.0.0") gem "chef-zero" gem "rspec", "~> 3.4" - gem "aruba", "~> 2.2" + gem "aruba", "~> 0.6" gem "chef", "~> 14.0" gem "chef-utils", "17.10.0" # pin until we drop ruby 2.5 else gem "chef-zero", ">= 15.0.4" gem "chef", "~> 17.0" gem "rspec", "~> 3.11" - gem "aruba", "~> 2.2" + gem "aruba", "~> 1.1" gem "knife", "~> 17.0" gem "chef-utils", "17.10.0" # pin until we drop ruby >=3 end From 3a12280b6a25e1b24cb48706c79ba4ec2836f033 Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Wed, 20 Sep 2023 13:22:36 +0530 Subject: [PATCH 09/21] updated gems Signed-off-by: nikhil2611 --- Gemfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 56d30db..ed7840d 100644 --- a/Gemfile +++ b/Gemfile @@ -10,7 +10,9 @@ group :development do gem "chef-zero" gem "rspec", "~> 3.4" gem "aruba", "~> 0.6" - gem "chef", "~> 14.0" + # gem "chef", "~> 14.0" + gem "chef", "~> 17.0" + gem "knife", "~> 17.0" gem "chef-utils", "17.10.0" # pin until we drop ruby 2.5 else gem "chef-zero", ">= 15.0.4" From 3a81e2ceef22b5c5eef13cdd0f37d76f06870dea Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Wed, 20 Sep 2023 13:44:22 +0530 Subject: [PATCH 10/21] updated gems Signed-off-by: nikhil2611 --- Gemfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index ed7840d..2145948 100644 --- a/Gemfile +++ b/Gemfile @@ -17,8 +17,8 @@ group :development do else gem "chef-zero", ">= 15.0.4" gem "chef", "~> 17.0" - gem "rspec", "~> 3.11" - gem "aruba", "~> 1.1" + gem "rspec", "~> 3.0" + gem "aruba", "~> 2.0" gem "knife", "~> 17.0" gem "chef-utils", "17.10.0" # pin until we drop ruby >=3 end From 0747c62d9805e47724d32f78a499b4ec7038179e Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Tue, 26 Sep 2023 12:28:57 +0530 Subject: [PATCH 11/21] removed the timeout tag Signed-off-by: nikhil2611 --- .expeditor/verify.pipeline.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index 7b9af24..c023a63 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -52,7 +52,6 @@ steps: - label: run-specs-ruby-3.1-windows command: - .expeditor/run_windows_tests.ps1 - timeout_in_minutes: 20 expeditor: executor: docker: From dcad4c2dc4975587ebffaf77308d1ff90aafe39e Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Thu, 28 Sep 2023 13:30:20 +0530 Subject: [PATCH 12/21] added win platforms condition Signed-off-by: nikhil2611 --- Rakefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Rakefile b/Rakefile index 34ab4a6..88694a0 100644 --- a/Rakefile +++ b/Rakefile @@ -1,5 +1,7 @@ require "bundler/gem_tasks" +WindowsPlatforms = %w{ x64-mingw32 x64-mingw-ucrt ruby } + # Style Tests begin require "chefstyle" @@ -36,7 +38,11 @@ end begin require "cucumber" require "cucumber/rake/task" - Cucumber::Rake::Task.new(:features) + Cucumber::Rake::Task.new(:features) do |t| + if RUBY_PLATFORM =~ WindowsPlatforms || RUBY_PLATFORM =~ /darwin/ + t.cucumber_opts = "--tags 'not @not-windows'" + end + end rescue LoadError puts "Cucumber/Aruba not available; disabling feature tasks" # create a no-op spec task for :default From cc13bef1366139fc5488758b2bb61b70db5e1b1c Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Thu, 28 Sep 2023 13:45:22 +0530 Subject: [PATCH 13/21] corrected the offenses Signed-off-by: nikhil2611 --- Rakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Rakefile b/Rakefile index 88694a0..371728c 100644 --- a/Rakefile +++ b/Rakefile @@ -1,6 +1,6 @@ require "bundler/gem_tasks" -WindowsPlatforms = %w{ x64-mingw32 x64-mingw-ucrt ruby } +WindowsPlatforms = %w{ x64-mingw32 x64-mingw-ucrt ruby }.freeze # Style Tests begin From 36d4c2f9a4f96a779cb102dd47f5a7588f8d6c7a Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Thu, 28 Sep 2023 13:57:34 +0530 Subject: [PATCH 14/21] corrected the offenses Signed-off-by: nikhil2611 --- Rakefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Rakefile b/Rakefile index 371728c..d234851 100644 --- a/Rakefile +++ b/Rakefile @@ -1,6 +1,6 @@ require "bundler/gem_tasks" -WindowsPlatforms = %w{ x64-mingw32 x64-mingw-ucrt ruby }.freeze +WINDOWS_PLATFORM = %w{ x64-mingw32 x64-mingw-ucrt ruby }.freeze # Style Tests begin @@ -39,7 +39,7 @@ begin require "cucumber" require "cucumber/rake/task" Cucumber::Rake::Task.new(:features) do |t| - if RUBY_PLATFORM =~ WindowsPlatforms || RUBY_PLATFORM =~ /darwin/ + if RUBY_PLATFORM =~ WINDOWS_PLATFORM || RUBY_PLATFORM =~ /darwin/ t.cucumber_opts = "--tags 'not @not-windows'" end end From 34924cffaf0980f1dfa5bc09d44751d14ce371a9 Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Thu, 28 Sep 2023 14:54:36 +0530 Subject: [PATCH 15/21] updated gems Signed-off-by: nikhil2611 --- Gemfile | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/Gemfile b/Gemfile index 2145948..4b63692 100644 --- a/Gemfile +++ b/Gemfile @@ -5,22 +5,20 @@ gemspec group :development do gem "chefstyle" gem "rake" - gem "contracts", "~> 0.16.1" # pin until we drop ruby < 2.7 + gem "contracts", "~> 0.17" # pin until we drop ruby < 2.7 if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("3.0.0") gem "chef-zero" - gem "rspec", "~> 3.4" - gem "aruba", "~> 0.6" - # gem "chef", "~> 14.0" - gem "chef", "~> 17.0" - gem "knife", "~> 17.0" - gem "chef-utils", "17.10.0" # pin until we drop ruby 2.5 + gem "rspec", "~> 3.12.0" + gem "aruba", "~> 2.2" + gem "chef", "~> 15.4" + gem "chef-utils", "17.10.68" # pin until we drop ruby 2.5 else gem "chef-zero", ">= 15.0.4" gem "chef", "~> 17.0" - gem "rspec", "~> 3.0" - gem "aruba", "~> 2.0" + gem "rspec", "~> 3.12.0" + gem "aruba", "~> 2.2" gem "knife", "~> 17.0" - gem "chef-utils", "17.10.0" # pin until we drop ruby >=3 + gem "chef-utils", "17.10.68" # pin until we drop ruby >=3 end end From 04c453ef8b05b96c648c3f3cc9565ec18aa10259 Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Thu, 28 Sep 2023 16:08:21 +0530 Subject: [PATCH 16/21] updated gems Signed-off-by: nikhil2611 --- Gemfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 4b63692..da8e8a4 100644 --- a/Gemfile +++ b/Gemfile @@ -5,14 +5,15 @@ gemspec group :development do gem "chefstyle" gem "rake" - gem "contracts", "~> 0.17" # pin until we drop ruby < 2.7 if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("3.0.0") + gem "contracts", "~> 0.16.1" # pin until we drop ruby < 2.7 gem "chef-zero" gem "rspec", "~> 3.12.0" gem "aruba", "~> 2.2" gem "chef", "~> 15.4" gem "chef-utils", "17.10.68" # pin until we drop ruby 2.5 else + gem "contracts", "~> 0.17" gem "chef-zero", ">= 15.0.4" gem "chef", "~> 17.0" gem "rspec", "~> 3.12.0" From 2b5291150fad45d2a87863c95de8735b137361ad Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Thu, 28 Sep 2023 18:01:24 +0530 Subject: [PATCH 17/21] updated pipeline Signed-off-by: nikhil2611 --- .expeditor/run_windows_tests.ps1 | 1 - .expeditor/verify.pipeline.yml | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.expeditor/run_windows_tests.ps1 b/.expeditor/run_windows_tests.ps1 index 3cce207..cd375f3 100644 --- a/.expeditor/run_windows_tests.ps1 +++ b/.expeditor/run_windows_tests.ps1 @@ -1,6 +1,5 @@ # Stop script execution when a non-terminating error occurs $ErrorActionPreference = "Stop" - # This will run ruby test on windows platform Write-Output "--- Bundle install" diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index c023a63..24d0281 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -36,7 +36,6 @@ steps: - label: run-specs-ruby-3.0-windows command: - .expeditor/run_windows_tests.ps1 - timeout_in_minutes: 20 expeditor: executor: docker: @@ -59,3 +58,7 @@ steps: shell: ["powershell", "-Command"] image: rubydistros/windows-2019:3.1 user: 'NT AUTHORITY\SYSTEM' + environment: + - FORCE_FFI_YAJL=ext + - EXPIRE_CACHE=true + - CHEF_LICENSE=accept-no-persist From 003f5fb98a574fe08657056cac7d2986e30cbc48 Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Thu, 28 Sep 2023 18:08:33 +0530 Subject: [PATCH 18/21] testing commit Signed-off-by: nikhil2611 --- .expeditor/run_windows_tests.ps1 | 1 + 1 file changed, 1 insertion(+) diff --git a/.expeditor/run_windows_tests.ps1 b/.expeditor/run_windows_tests.ps1 index cd375f3..3cce207 100644 --- a/.expeditor/run_windows_tests.ps1 +++ b/.expeditor/run_windows_tests.ps1 @@ -1,5 +1,6 @@ # Stop script execution when a non-terminating error occurs $ErrorActionPreference = "Stop" + # This will run ruby test on windows platform Write-Output "--- Bundle install" From 908f302345ea2bdb0bbd3eb079fe6d96cf9ff073 Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Fri, 29 Sep 2023 00:46:57 +0530 Subject: [PATCH 19/21] corrected indentation Signed-off-by: nikhil2611 --- .expeditor/verify.pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index 24d0281..4155273 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -58,7 +58,7 @@ steps: shell: ["powershell", "-Command"] image: rubydistros/windows-2019:3.1 user: 'NT AUTHORITY\SYSTEM' - environment: + environment: - FORCE_FFI_YAJL=ext - EXPIRE_CACHE=true - CHEF_LICENSE=accept-no-persist From 1547f6d2fd0fdc500df2f33867b15ed0a609cc69 Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Mon, 9 Oct 2023 02:15:51 +0530 Subject: [PATCH 20/21] updated gems Signed-off-by: nikhil2611 --- Gemfile | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index da8e8a4..e5b1ea3 100644 --- a/Gemfile +++ b/Gemfile @@ -8,15 +8,23 @@ group :development do if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("3.0.0") gem "contracts", "~> 0.16.1" # pin until we drop ruby < 2.7 gem "chef-zero" - gem "rspec", "~> 3.12.0" + gem "rspec", "~> 3.0" gem "aruba", "~> 2.2" gem "chef", "~> 15.4" gem "chef-utils", "17.10.68" # pin until we drop ruby 2.5 + elsif Gem::Version.new(RUBY_VERSION) > Gem::Version.new("3.0.0") + gem "contracts", "~> 0.17" + gem "chef-zero", ">= 15.0.4" + gem "chef", "~> 18.0" + gem "rspec", "~> 3.0" + gem "aruba", "~> 2.2" + gem "knife", "~> 18.0" + gem "chef-utils", "~> 18.0" else gem "contracts", "~> 0.17" gem "chef-zero", ">= 15.0.4" gem "chef", "~> 17.0" - gem "rspec", "~> 3.12.0" + gem "rspec", "~> 3.0" gem "aruba", "~> 2.2" gem "knife", "~> 17.0" gem "chef-utils", "17.10.68" # pin until we drop ruby >=3 From 5fcc492585582b84ebb1a456eda8da2032e6a198 Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Mon, 9 Oct 2023 11:26:08 +0530 Subject: [PATCH 21/21] updated gems to last commit Signed-off-by: nikhil2611 --- Gemfile | 8 -------- 1 file changed, 8 deletions(-) diff --git a/Gemfile b/Gemfile index e5b1ea3..089115f 100644 --- a/Gemfile +++ b/Gemfile @@ -12,14 +12,6 @@ group :development do gem "aruba", "~> 2.2" gem "chef", "~> 15.4" gem "chef-utils", "17.10.68" # pin until we drop ruby 2.5 - elsif Gem::Version.new(RUBY_VERSION) > Gem::Version.new("3.0.0") - gem "contracts", "~> 0.17" - gem "chef-zero", ">= 15.0.4" - gem "chef", "~> 18.0" - gem "rspec", "~> 3.0" - gem "aruba", "~> 2.2" - gem "knife", "~> 18.0" - gem "chef-utils", "~> 18.0" else gem "contracts", "~> 0.17" gem "chef-zero", ">= 15.0.4"