summaryrefslogtreecommitdiff
path: root/scripts/ci/verify-plan.ps1
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/ci/verify-plan.ps1')
-rw-r--r--scripts/ci/verify-plan.ps113
1 files changed, 3 insertions, 10 deletions
diff --git a/scripts/ci/verify-plan.ps1 b/scripts/ci/verify-plan.ps1
index 880e5a3262..bf206fab9c 100644
--- a/scripts/ci/verify-plan.ps1
+++ b/scripts/ci/verify-plan.ps1
@@ -12,20 +12,12 @@ $Plan = 'chef-infra-client'
Write-Host "--- :8ball: :windows: Verifying $Plan"
-$hab_version = (hab --version)
-$hab_minor_version = $hab_version.split('.')[1]
-if ( -not $? -Or $hab_minor_version -lt 85 ) {
- Write-Host "--- :habicat: Installing the version of Habitat required"
- install-habitat --version 0.85.0.20190916
-} else {
- Write-Host "--- :habicat: :thumbsup: Minimum required version of Habitat already installed"
-}
-
+powershell -File "./scripts/ci/ensure-minimum-viable-hab.ps1"
+if (-not $?) { throw "Could not ensure the minimum hab version required is installed." }
Write-Host "--- :key: Generating fake origin key"
hab origin key generate $env:HAB_ORIGIN
-
$project_root = "$(git rev-parse --show-toplevel)"
Set-Location $project_root
@@ -42,3 +34,4 @@ if (-not $?) { throw "unable to install this build"}
Write-Host "--- :mag_right: Testing $Plan"
powershell -File "./habitat/tests/test.ps1" -PackageIdentifier $pkg_ident
+if (-not $?) { throw "package didn't pass the test suite" }