From d27c3236746752dfdb9100ea691bbfbae18072dd Mon Sep 17 00:00:00 2001
From: poornima <poorndm@progress.com>
Date: Wed, 2 Mar 2022 16:36:33 +0530
Subject: Test Ruby 3.0/3.1

Signed-off-by: poornima <poorndm@progress.com>
---
 .expeditor/verify.pipeline.yml | 42 ++++++++++++++++++++++++++++++------------
 .github/CODEOWNERS             |  4 ++--
 2 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml
index 580c5fb..846b993 100644
--- a/.expeditor/verify.pipeline.yml
+++ b/.expeditor/verify.pipeline.yml
@@ -15,7 +15,7 @@ steps:
   expeditor:
     executor:
       docker:
-        image: ruby:2.5-buster
+        image: ruby:2.5
 
 - label: run-specs-ruby-2.6
   command:
@@ -23,7 +23,7 @@ steps:
   expeditor:
     executor:
       docker:
-        image: ruby:2.6-buster
+        image: ruby:2.6
 
 - label: run-specs-ruby-2.7
   command:
@@ -31,25 +31,43 @@ steps:
   expeditor:
     executor:
       docker:
-        image: ruby:2.7-buster
+        image: ruby:2.7
 
-- label: run-specs-windows
+- label: run-specs-ruby-3.0
   command:
-    - bundle config set --local without docs debug
-    - bundle install --jobs=7 --retry=3
-    - bundle exec rake spec
+    - .expeditor/run_linux_tests.sh rake
   expeditor:
     executor:
       docker:
-        host_os: windows
+        image: ruby:3.0
+
+- label: run-specs-ruby-3.1
+  command:
+    - .expeditor/run_linux_tests.sh rake
+  expeditor:
+    executor:
+      docker:
+        image: ruby:3.1
 
-- label: "Unit and Functional Testing Windows :ruby: 3.0"
+- label: run-specs-ruby-3.0-windows
   command:
-    - bundle config set --local without docs debug
-    - bundle install --jobs=7 --retry=3
-    - bundle exec rake spec
+    - .expeditor/run_windows_tests.ps1
   expeditor:
     executor:
       docker:
         host_os: windows
+        shell: ["powershell", "-Command"]
         image: rubydistros/windows-2019:3.0
+        user: 'NT AUTHORITY\SYSTEM'
+
+- label: run-specs-ruby-3.1-windows
+  command:
+    - .expeditor/run_windows_tests.ps1
+  expeditor:
+    executor:
+      docker:
+        host_os: windows
+        shell: ["powershell", "-Command"]
+        image: rubydistros/windows-2019:3.1
+        user: 'NT AUTHORITY\SYSTEM'
+
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index b82929a..6832f2b 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,5 +1,5 @@
 # Order is important. The last matching pattern has the most precedence.
 
-*                 @chef/msys-developers
-.expeditor/       @chef/jex-team
+*                 @chef/msys-developers @chef/chef-infra-reviewers @chef/chef-infra-approvers @chef/chef-infra-owners
+.expeditor/       @chef/infra-packages
 *.md              @chef/docs-team
-- 
cgit v1.2.1