From 5460919d0313a53c8eb36aa7c98c9c87431f89ba Mon Sep 17 00:00:00 2001
From: Jaymala Sinha <jsinha@chef.io>
Date: Thu, 10 Oct 2019 14:51:02 -0400
Subject: Fix verification tests

Signed-off-by: Jaymala Sinha <jsinha@chef.io>
---
 .expeditor/buildkite/verify.ps1 |  6 ++++--
 .expeditor/config.yml           |  3 ++-
 .expeditor/verify.pipeline.yml  | 36 +++++++++++++++++++++++++++++++-----
 3 files changed, 37 insertions(+), 8 deletions(-)

(limited to '.expeditor')

diff --git a/.expeditor/buildkite/verify.ps1 b/.expeditor/buildkite/verify.ps1
index cb4e5c8..4e94454 100644
--- a/.expeditor/buildkite/verify.ps1
+++ b/.expeditor/buildkite/verify.ps1
@@ -4,7 +4,7 @@ Get-CimInstance Win32_OperatingSystem | Select-Object $Properties | Format-Table
 
 # Set-Item -Path Env:Path -Value ($Env:Path + ";C:\Program Files\Git\mingw64\bin;C:\Program Files\Git\usr\bin") 
 $Env:Path="C:\Program Files\Git\mingw64\bin;C:\Program Files\Git\usr\bin;C:\ruby26\bin;C:\ci-studio-common\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\ProgramData\chocolatey\bin;C:\Program Files\Git\cmd;C:\Users\ContainerAdministrator\AppData\Local\Microsoft\WindowsApps;C:\Go\bin;C:\Users\ContainerAdministrator\go\bin"
-
+$Env:RUBY_PLATFORM="windows"
 
 ruby -v
 bundle --version
@@ -16,8 +16,10 @@ bundle install --jobs=7 --retry=3 --without docs debug
 echo "--- bundle env"
 bundle env
 
-echo "+++ bundle exec rake"
+echo "+++ bundle exec rake compile"
 bundle exec rake compile
+
+echo "+++ bundle exec rake compile"
 bundle exec rake spec
 
 exit $LASTEXITCODE
\ No newline at end of file
diff --git a/.expeditor/config.yml b/.expeditor/config.yml
index ac559df..ae7f111 100644
--- a/.expeditor/config.yml
+++ b/.expeditor/config.yml
@@ -7,6 +7,7 @@ slack:
 # This publish is triggered by the `built_in:publish_rubygems` artifact_action.
 rubygems:
   - ffi-yajl
+  - ffi-yajl-universla-java
 
 github:
   # This deletes the GitHub PR branch after successfully merged into the release branch
@@ -44,4 +45,4 @@ promote:
 pipelines:
   - verify:
       description: Pull Request validation tests
-      public: true
+      public: true
\ No newline at end of file
diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml
index 825e2a1..8237b99 100644
--- a/.expeditor/verify.pipeline.yml
+++ b/.expeditor/verify.pipeline.yml
@@ -1,31 +1,54 @@
 steps:
 
-- label: run-lint-and-specs-ruby-2.4
+- label: ":ruby: 2.4"
   command:
+    - ruby --version
+    - bundle --version
+    - gem update --system
     - bundle install --jobs=7 --retry=3 --without docs development
     - bundle exec rake
   expeditor:
     executor:
       docker:
-        image: ruby:2.4-stretch
-        privileged: true
+        image: ruby:2.4
         environment:
           - BUNDLE_GEMFILE=/workdir/Gemfile
 
-- label: run-lint-and-specs-ruby-2.6
+- label: ":ruby: 2.5"
   command:
+    - ruby --version
+    - bundle --version
+    - gem update --system
     - bundle install --jobs=7 --retry=3 --without docs development
     - bundle exec rake
   expeditor:
     executor:
       docker:
-        image: ruby:2.6-stretch
+        image: ruby:2.5
+        environment:
+          - BUNDLE_GEMFILE=/workdir/Gemfile
+
+- label: ":ruby: 2.6"
+  command:
+    - ruby --version
+    - bundle --version
+    - gem update --system
+    - bundle install --jobs=7 --retry=3 --without docs development
+    - bundle exec rake
+  expeditor:
+    executor:
+      docker:
+        image: ruby:2.6
         privileged: true
         environment:
           - BUNDLE_GEMFILE=/workdir/Gemfile
 
 - label: run-lint-and-specs-jruby
   command:
+    - ruby --version
+    - bundle --version
+    - gem update --system
+    - apt-get update -y && apt-get install -y git
     - bundle install --jobs=7 --retry=3 --without docs development
     - bundle exec rake
   expeditor:
@@ -35,6 +58,7 @@ steps:
         privileged: true
         environment:
           - BUNDLE_GEMFILE=/workdir/Gemfile
+          - RUBY_PLATFORM="jruby"
 
 - label: run-specs-windows
   command:
@@ -43,4 +67,6 @@ steps:
     executor:
       docker:
         host_os: windows
+        environment:
+          - RUBY_PLATFORM="windows"
         shell: ["powershell", "-Command"]
-- 
cgit v1.2.1