From 448bf7e9f085dcaadca88ff9d23654f3987dd396 Mon Sep 17 00:00:00 2001
From: skeshari12 <skeshari@msystechnologies.com>
Date: Wed, 6 Apr 2022 18:48:47 +0530
Subject: [PATCH] Add ruby-3.0 & ruby-3.1 test on windows and remove linux
 tests

Signed-off-by: skeshari12 <skeshari@msystechnologies.com>
---
 .expeditor/run_linux_tests.sh  | 53 ----------------------------------
 .expeditor/verify.pipeline.yml | 47 +++++-------------------------
 2 files changed, 8 insertions(+), 92 deletions(-)
 delete mode 100755 .expeditor/run_linux_tests.sh

diff --git a/.expeditor/run_linux_tests.sh b/.expeditor/run_linux_tests.sh
deleted file mode 100755
index 4c14c80..0000000
--- a/.expeditor/run_linux_tests.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/bash
-#
-# This script runs a passed in command, but first setups up the bundler caching on the repo
-
-set -ue
-
-export USER="root"
-
-echo "--- dependencies"
-export LANG=C.UTF-8 LANGUAGE=C.UTF-8
-S3_URL="s3://public-cd-buildkite-cache/${BUILDKITE_PIPELINE_SLUG}/${BUILDKITE_LABEL}"
-
-pull_s3_file() {
-    aws s3 cp "${S3_URL}/$1" "$1" || echo "Could not pull $1 from S3"
-}
-
-push_s3_file() {
-    if [ -f "$1" ]; then
-        aws s3 cp "$1" "${S3_URL}/$1" || echo "Could not push $1 to S3 for caching."
-    fi
-}
-
-apt-get update -y
-apt-get install awscli -y
-
-echo "--- bundle install"
-pull_s3_file "bundle.tar.gz"
-pull_s3_file "bundle.sha256"
-
-if [ -f bundle.tar.gz ]; then
-  tar -xzf bundle.tar.gz
-fi
-
-if [ -n "${RESET_BUNDLE_CACHE:-}" ]; then
-    rm bundle.sha256
-fi
-
-bundle config --local path vendor/bundle
-bundle install --jobs=7 --retry=3
-
-echo "--- bundle cache"
-if test -f bundle.sha256 && shasum --check bundle.sha256 --status; then
-    echo "Bundled gems have not changed. Skipping upload to s3"
-else
-    echo "Bundled gems have changed. Uploading to s3"
-    shasum -a 256 Gemfile.lock > bundle.sha256
-    tar -czf bundle.tar.gz vendor/
-    push_s3_file bundle.tar.gz
-    push_s3_file bundle.sha256
-fi
-
-echo "+++ bundle exec task"
-bundle exec $1
diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml
index 544bcd6..28328a3 100644
--- a/.expeditor/verify.pipeline.yml
+++ b/.expeditor/verify.pipeline.yml
@@ -7,55 +7,24 @@ expeditor:
           limit: 1
       timeout_in_minutes: 30
 
-# why do we test on Linux? It's the easiest way to run specs quickly on multiple ruby versions so we test on Windows and then on various ruby releases using Linux agents
 steps:
-- label: lint-chefstyle
-  command:
-    - .expeditor/run_linux_tests.sh "rake style"
-  expeditor:
-    executor:
-      docker:
-        image: ruby:2.7-buster
-
-- label: run-specs-ruby-2.6
-  command:
-    - .expeditor/run_linux_tests.sh rspec
-  expeditor:
-    executor:
-      docker:
-        image: ruby:2.6-buster
-
-- label: run-specs-ruby-2.7
-  command:
-    - .expeditor/run_linux_tests.sh rspec
-  expeditor:
-    executor:
-      docker:
-        image: ruby:2.7-buster
 
-- label: run-specs-ruby-3.0
-  command:
-    - .expeditor/run_linux_tests.sh rspec
-  expeditor:
-    executor:
-      docker:
-        image: ruby:3.0-buster
-
-- label: run-specs-ruby-3.1
-  command:
-    - .expeditor/run_linux_tests.sh rspec
+- label: "run-specs-ruby-3.0-windows"
+  commands:
+    - .expeditor/verify_win32certstore.ps1
   expeditor:
     executor:
       docker:
-        image: ruby:3.1-buster
+        host_os: windows
+        image: rubydistros/windows-2019:3.0
+        shell: [ "powershell", "-Command" ]
 
-- label: "run specs :windows:"
+- label: "run-specs-ruby-3.1-windows"
   commands:
-    # - Get-Childitem .expeditor
     - .expeditor/verify_win32certstore.ps1
   expeditor:
     executor:
       docker:
         host_os: windows
-        image: rubydistros/windows-2019:3.0
+        image: rubydistros/windows-2019:3.1
         shell: [ "powershell", "-Command" ]