From 6af557f3de72e9568642a754983fa9b5c8a4f5da Mon Sep 17 00:00:00 2001
From: Lamont Granquist <lamont@scriptkiddie.org>
Date: Thu, 9 Dec 2021 17:13:08 -0800
Subject: Properly fail on windows tests

This ensures that we cannot silently start failing to appbundle without
failing these tests.

There's a fairly bad bug here where the bundle install is failing due to
native gems (that apparently we don't actually need) and it doesn't seem
to matter for testing (all kinds of junk that kitchen-inspec brings in)

Once that is fixed, the bundle install should no longer be ignored, and
then the manual install of berkshelf can be removed.

Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
---
 .github/workflows/kitchen.yml | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to '.github')

diff --git a/.github/workflows/kitchen.yml b/.github/workflows/kitchen.yml
index d32762a1d7..705b6ac1dc 100644
--- a/.github/workflows/kitchen.yml
+++ b/.github/workflows/kitchen.yml
@@ -31,26 +31,29 @@ jobs:
         $env:PATH = "C:\opscode\chef\bin;C:\opscode\chef\embedded\bin;" + $env:PATH
         $env:OHAI_VERSION = ( Select-String -Path .\Gemfile.lock -Pattern '(?<=ohai \()\d.*(?=\))' | ForEach-Object { $_.Matches[0].Value } )
         gem install appbundler appbundle-updater --no-doc
+        If ($lastexitcode -ne 0) { Exit $lastexitcode }
         appbundle-updater chef chef $env:GITHUB_SHA --tarball --github $env:GITHUB_REPOSITORY
+        If ($lastexitcode -ne 0) { Exit $lastexitcode }
         Write-Output "Installed Chef / Ohai release:"
         chef-client -v
+        If ($lastexitcode -ne 0) { Exit $lastexitcode }
         ohai -v
+        If ($lastexitcode -ne 0) { Exit $lastexitcode }
     - name: 'Run end_to_end::default recipe'
       id: run
       run: |
         cd kitchen-tests
         $env:PATH = "C:\opscode\chef\bin;C:\opscode\chef\embedded\bin;" + $env:PATH
-        bundle config set --local without 'omnibus_package'
-        bundle config set --local path 'vendor/bundle'
         bundle install --jobs=3 --retry=3
+        # If ($lastexitcode -ne 0) { Exit $lastexitcode }
+        # The bundle install command above fails because our build on windows on ruby-3.0 is
+        # completely broken when it comes to installing native gems.  Until that is fixed we
+        # need to ignore that error code and to manually install berkshelf below.  This is a
+        # very bad hack.
         gem install berkshelf --no-doc
-        # berks emits a ruby warning when it loads net/http due to a previously
-        # defined constant. Even though it is just a warning, powershell immediately
-        # exits 1. I'm not sure why but this just suppresses the warnings.
-        $env:RUBYOPT="-W0"
+        If ($lastexitcode -ne 0) { Exit $lastexitcode }
         berks vendor cookbooks
-        # restore the default warning level
-        $env:RUBYOPT="-W1"
+        If ($lastexitcode -ne 0) { Exit $lastexitcode }
         chef-client -z -o end_to_end --chef-license accept-no-persist
 
   macos:
-- 
cgit v1.2.1