summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBapu L <bapu.labade@progress.com>2022-08-24 19:28:27 +0530
committerBapu L <bapu.labade@progress.com>2022-08-24 19:37:09 +0530
commit07e74cbe9979915776129e93010bc287b1be71dd (patch)
tree606376ffd45712d775bd4fdb76a66dcd9e344283
parent11b2ee91f7a2f9affb2ae311b32bcd6725317f64 (diff)
downloadchef-07e74cbe9979915776129e93010bc287b1be71dd.tar.gz
Fix Windows functional plan
Signed-off-by: Bapu L <bapu.labade@progress.com>
-rw-r--r--.expeditor/scripts/bk_win_functional.ps12
-rw-r--r--.expeditor/scripts/ensure-minimum-viable-hab.ps13
-rw-r--r--.expeditor/scripts/verify-plan.ps11
3 files changed, 4 insertions, 2 deletions
diff --git a/.expeditor/scripts/bk_win_functional.ps1 b/.expeditor/scripts/bk_win_functional.ps1
index 8b4a445b44..a2f93378dd 100644
--- a/.expeditor/scripts/bk_win_functional.ps1
+++ b/.expeditor/scripts/bk_win_functional.ps1
@@ -11,7 +11,7 @@ Write-Output "--- Enable Ruby 2.7"
Write-Output "Register Installed Ruby Version 2.7 With Uru"
Start-Process "uru_rt.exe" -ArgumentList 'admin add C:\ruby27\bin' -Wait
-uru 271
+uru 27
if (-not $?) { throw "Can't Activate Ruby. Did Uru Registration Succeed?" }
ruby -v
if (-not $?) { throw "Can't run Ruby. Is it installed?" }
diff --git a/.expeditor/scripts/ensure-minimum-viable-hab.ps1 b/.expeditor/scripts/ensure-minimum-viable-hab.ps1
index 10bfeb0fa8..716de60cf8 100644
--- a/.expeditor/scripts/ensure-minimum-viable-hab.ps1
+++ b/.expeditor/scripts/ensure-minimum-viable-hab.ps1
@@ -1,7 +1,8 @@
[Version]$hab_version = (hab --version).split(" ")[1].split("/")[0]
if ($hab_version -lt [Version]"0.85.0" ) {
Write-Host "--- :habicat: Installing the version of Habitat required"
- install-habitat --version 0.85.0.20190916
+ Set-ExecutionPolicy Bypass -Scope Process -Force
+ Invoke-Expression ((New-Object System.Net.WebClient).DownloadString('https://raw.githubusercontent.com/habitat-sh/habitat/main/components/hab/install.ps1'))
if (-not $?) { throw "Hab version is older than 0.85 and could not update it." }
} else {
Write-Host "--- :habicat: :thumbsup: Minimum required version of Habitat already installed"
diff --git a/.expeditor/scripts/verify-plan.ps1 b/.expeditor/scripts/verify-plan.ps1
index 614d472964..6fe2e3772a 100644
--- a/.expeditor/scripts/verify-plan.ps1
+++ b/.expeditor/scripts/verify-plan.ps1
@@ -14,6 +14,7 @@ Write-Host "--- :8ball: :windows: Verifying $Plan"
powershell -File "./.expeditor/scripts/ensure-minimum-viable-hab.ps1"
if (-not $?) { throw "Could not ensure the minimum hab version required is installed." }
+$env:Path = [System.Environment]::GetEnvironmentVariable("Path", "Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path", "User")
Write-Host "--- :key: Generating fake origin key"
hab origin key generate $env:HAB_ORIGIN