add ruby 3.1 in verfiy pipeline

Signed-off-by: skeshari12 <skeshari@msystechnologies.com>

5 files changed, 84 insertions, 47 deletions

diff --git a/.expeditor/buildkite/run_linux_tests.sh b/.expeditor/buildkite/run_linux_tests.sh
new file mode 100755
index 0000000..3774734
--- /dev/null
+++ b/.expeditor/buildkite/run_linux_tests.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+#
+
+set -evx
+
+echo "---Bundle install---"
+ruby --version
+bundle --version
+gem update --system
+bundle install --without development_extras --jobs 3 --retry 3 --path vendor/bundle
+gem install yajl-ruby json psych
+
+echo "---Bundle Exec---"
+bundle exec rake
\ No newline at end of file
diff --git a/.expeditor/buildkite/run_windows_tests.ps1 b/.expeditor/buildkite/run_windows_tests.ps1
new file mode 100644
index 0000000..23f02c3
--- /dev/null
+++ b/.expeditor/buildkite/run_windows_tests.ps1
@@ -0,0 +1,20 @@
+# Stop script execution when a non-terminating error occurs
+$ErrorActionPreference = "Stop"
+
+# This will run ruby test on windows platform
+
+echo "--- Install make "
+choco install make --source=cygwin 
+
+Write-Output "--- Bundle install"
+ruby --version
+bundler --version
+gem update --system
+bundle install --without development_extras --jobs 3 --retry 3 --path vendor/bundle
+gem install yajl-ruby json psych
+If ($lastexitcode -ne 0) { Exit $lastexitcode }
+
+Write-Output "--- Bundle Execute"
+bundle exec rake compile
+bundle exec rake spec
+If ($lastexitcode -ne 0) { Exit $lastexitcode }
\ No newline at end of file
diff --git a/.expeditor/buildkite/verify.ps1 b/.expeditor/buildkite/verify.ps1
index 106e1bf..c72188b 100644
--- a/.expeditor/buildkite/verify.ps1
+++ b/.expeditor/buildkite/verify.ps1
@@ -2,37 +2,37 @@ echo "--- system details"
 $Properties = 'Caption', 'CSName', 'Version', 'BuildType', 'OSArchitecture'
 Get-CimInstance Win32_OperatingSystem | Select-Object $Properties | Format-Table -AutoSize
 
-echo "--- Install make and ruby2.devkit"
-choco install make ruby ruby2.devkit -y
+echo "--- Install make"
+choco install make -y
 refreshenv
-
-echo - c:\tools\ruby26 > c:\tools\Devkit2\config.yml
-ruby c:\tools\Devkit2\dk.rb install
+If ($lastexitcode -ne 0) { Exit $lastexitcode }
 
 choco install msys2 -y
 refreshenv
+If ($lastexitcode -ne 0) { Exit $lastexitcode }
 
 Write-Output 'Updating PATH'
 $env:PATH = "C:\tools\ruby26\bin;C:\tools\DevKit2\mingw\bin;C:\tools\DevKit2\bin;" + $env:PATH
 [Environment]::SetEnvironmentVariable('PATH', $env:PATH, [EnvironmentVariableTarget]::Machine)
+If ($lastexitcode -ne 0) { Exit $lastexitcode }
 
 ruby -v
 bundle --version
 gem -v
-
-C:\tools\ruby26\ridk_use\ridk.cmd install 3
-C:\tools\ruby26\ridk_use\ridk.cmd  enable
+If ($lastexitcode -ne 0) { Exit $lastexitcode }
 
 echo "--- gem install bundler"
 gem install bundler
+If ($lastexitcode -ne 0) { Exit $lastexitcode }
 
 echo "--- bundle install"
 bundle install --without development_extras --jobs 3 --retry 3 --path vendor/bundle
+If ($lastexitcode -ne 0) { Exit $lastexitcode }
 
 echo "+++ bundle exec rake compile"
 bundle exec rake compile
+If ($lastexitcode -ne 0) { Exit $lastexitcode }
 
 echo "+++ bundle exec rake spec"
 bundle exec rake spec
-
-exit $LASTEXITCODE
\ No newline at end of file
+If ($lastexitcode -ne 0) { Exit $lastexitcode }
\ No newline at end of file
diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml
index 06ca2f3..83ce300 100644
--- a/.expeditor/verify.pipeline.yml
+++ b/.expeditor/verify.pipeline.yml
@@ -3,12 +3,7 @@ steps:
 # Allow ruby-2.4 to softfail since it was configured so in travis too
 - label: ":ruby: 2.4"
   command:
-    - ruby --version
-    - bundle --version
-    - gem update --system
-    - bundle install --without development_extras --jobs 3 --retry 3 --path vendor/bundle
-    - gem install yajl-ruby json psych
-    - bundle exec rake
+    - .expeditor/buildkite/run_linux_tests.sh
   soft_fail:
       - exit_status: 1
   expeditor:
@@ -21,12 +16,7 @@ steps:
 
 - label: ":ruby: 2.5"
   command:
-    - ruby --version
-    - bundle --version
-    - gem update --system
-    - bundle install --without development_extras --jobs 3 --retry 3 --path vendor/bundle
-    - gem install yajl-ruby json psych
-    - bundle exec rake
+    - .expeditor/buildkite/run_linux_tests.sh
   expeditor:
     executor:
       docker:
@@ -37,49 +27,62 @@ steps:
 
 - label: ":ruby: 2.6"
   command:
-    - ruby --version
-    - bundle --version
-    - gem update --system
-    - bundle install --without development_extras --jobs 3 --retry 3 --path vendor/bundle
-    - gem install yajl-ruby json psych
-    - bundle exec rake
+    - .expeditor/buildkite/run_linux_tests.sh
   expeditor:
     executor:
       docker:
         image: ruby:2.6
-        privileged: true
         environment:
           - BUNDLE_GEMFILE=/workdir/Gemfile
           - FORCE_FFI_YAJL="ext"
 
-# Allow jruby to softfail since it was configured so in travis too
-- label: run-lint-and-specs-jruby
+- label: ":ruby: 3.0"
   command:
-    - ruby --version
-    - bundle --version
-    - gem update --system
-    - apt-get update -y && apt-get install -y git make gcc
-    - bundle install --without development_extras --jobs 3 --retry 3 --path vendor/bundle
-    - gem install ffi json psych
-    - bundle exec rake
-  soft_fail:
-      - exit_status: 1
+    - .expeditor/buildkite/run_linux_tests.sh
   expeditor:
     executor:
       docker:
-        image: jruby
+        image: ruby:3.0
+        environment:
+          - BUNDLE_GEMFILE=/workdir/Gemfile
+          - FORCE_FFI_YAJL="ext"
+
+- label: ":ruby: 3.1"
+  command:
+    - .expeditor/buildkite/run_linux_tests.sh
+  expeditor:
+    executor:
+      docker:
+        image: ruby:3.1
         privileged: true
         environment:
           - BUNDLE_GEMFILE=/workdir/Gemfile
-          - RUBY_PLATFORM="jruby"
-          - FORCE_FFI_YAJL="ffi"
+          - FORCE_FFI_YAJL="ext"
+
+- label: "run-specs-ruby-3.0-windows"
+  command:
+    - .expeditor/buildkite/run_windows_tests.ps1
+  timeout_in_minutes: 20
+  expeditor:
+    executor:
+      docker:
+        host_os: windows
+        shell: ["powershell", "-Command"]
+        image: rubydistros/windows-2019:3.0
+        environment:
+          - BUNDLE_GEMFILE=/workdir/Gemfile
+          - FORCE_FFI_YAJL="ext"
 
-- label: "run specs :windows:"
+- label: "run-specs-ruby-3.1-windows"
   command:
-    - /workdir/.expeditor/buildkite/verify.ps1
+    - .expeditor/buildkite/run_windows_tests.ps1
   timeout_in_minutes: 20
   expeditor:
     executor:
       docker:
         host_os: windows
         shell: ["powershell", "-Command"]
+        image: rubydistros/windows-2019:3.1
+        environment:
+          - BUNDLE_GEMFILE=/workdir/Gemfile
+          - FORCE_FFI_YAJL="ext"
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 950afb7..0a26873 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,5 +1,5 @@
 # Order is important. The last matching pattern has the most precedence.
 
-*                 @chef/chef-foundation-owners @chef/chef-foundation-approvers @chef/chef-foundation-reviewers
-.expeditor/       @chef/jex-team
+*                 @chef/chef-infra-owners @chef/chef-infra-approvers @chef/chef-infra-reviewers
+.expeditor/       @chef/infra-packages
 *.md              @chef/docs-team