summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith84@gmail.com>2020-12-28 17:49:33 -0800
committerTim Smith <tsmith84@gmail.com>2020-12-30 12:16:46 -0800
commit58e2c15b7dbf983322250fd42210895f1978a772 (patch)
tree00c197ff1059656fbb1f086267de6cad9a5e0e46
parent0617f0b7fd7dabd366b3eb1087438eca142b11dd (diff)
downloadchef-58e2c15b7dbf983322250fd42210895f1978a772.tar.gz
Skip bundler update in the windows functional tests
Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--.expeditor/scripts/bk_win_functional.ps117
1 files changed, 3 insertions, 14 deletions
diff --git a/.expeditor/scripts/bk_win_functional.ps1 b/.expeditor/scripts/bk_win_functional.ps1
index 3cc38f0b37..9ff32ffce5 100644
--- a/.expeditor/scripts/bk_win_functional.ps1
+++ b/.expeditor/scripts/bk_win_functional.ps1
@@ -8,6 +8,9 @@ Remove-Item -Path C:\ProgramData\chocolatey\bin\choco.exe -ErrorAction SilentlyC
$ErrorActionPreference = 'Stop'
Write-Output "--- Enable Ruby 2.7"
+ruby -v
+if (-not $?) { throw "Can't run Ruby. Is it installed?" }
+
Write-Output "Add Uru to Environment PATH"
$env:PATH = "C:\Program Files (x86)\Uru;" + $env:PATH
[Environment]::SetEnvironmentVariable('PATH', $env:PATH, [EnvironmentVariableTarget]::Machine)
@@ -18,22 +21,8 @@ uru 271
if (-not $?) { throw "Can't Activate Ruby. Did Uru Registration Succeed?" }
Write-Output "--- configure winrm"
-
winrm quickconfig -q
-Write-Output "--- update bundler"
-
-ruby -v
-if (-not $?) { throw "Can't run Ruby. Is it installed?" }
-
-$env:BUNDLER_VERSION=$(findstr bundler omnibus_overrides.rb | %{ $_.split(" ")[3] })
-$env:BUNDLER_VERSION=($env:BUNDLER_VERSION -replace '"', "")
-Write-Output $env:BUNDLER_VERSION
-
-gem install bundler -v $env:BUNDLER_VERSION --force --no-document --quiet
-if (-not $?) { throw "Unable to update Bundler" }
-bundle --version
-
Write-Output "--- bundle install"
bundle install --jobs=3 --retry=3 --without omnibus_package
if (-not $?) { throw "Unable to install gem dependencies" }