Neaten up Java WS on Jenkins (#102)

couchbaselabs · Nov 25, 2024 · 2ef4e4c · 2ef4e4c
1 parent 8f73a07
commit 2ef4e4c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/jenkins/pipelines/java/desktop/win_tests.ps1 b/jenkins/pipelines/java/desktop/win_tests.ps1
@@ -40,7 +40,7 @@ try
     Pop-Location
 
     Write-Host "Windows Desktop: Start the environment"
-    & .\jenkins\pipelines\shared\setup_backend.ps1 $sgUrl
+    & .\jenkins\pipelines\shared\setup_backend.ps1 "$sgUrl"
 
     Write-Host "Windows Desktop: Wait for the Test Server..."
     $urlFile = "servers\jak\desktop\server.url"

diff --git a/jenkins/pipelines/java/webservice/win_teardown.ps1 b/jenkins/pipelines/java/webservice/win_teardown.ps1
@@ -9,12 +9,12 @@ param (
 $ErrorActionPreference = "Stop"
 [System.Environment]::SetEnvironmentVariable("JAVA_HOME", "C:\Program Files\Microsoft\jdk-17.0.13.11-hotspot")
 
-# $cblVersion = "${version}-${buildNumber}"
+$cblVersion = "${version}-${buildNumber}"
 
-# Write-Host "Windows Web Service: Shutdown the Test Server"
-# Push-Location servers\jak\webservice
-# & .\gradlew.bat --no-daemon appStop -PcblVersion="${cblVersion}"
-# Pop-Location
+Write-Host "Windows Web Service: Shutdown the Test Server"
+Push-Location servers\jak\webservice
+& .\gradlew.bat --no-daemon appStop -PcblVersion="${cblVersion}"
+Pop-Location
 
 Write-Host "Windows Web Service: Shutdown the environment"
 Push-Location environment

diff --git a/jenkins/pipelines/java/webservice/win_tests.ps1 b/jenkins/pipelines/java/webservice/win_tests.ps1
@@ -31,7 +31,7 @@ try
     Pop-Location
 
     Write-Host "Windows Web Service: Start the environment"
-    & .\jenkins\pipelines\shared\setup_backend.ps1 $sgUrl
+    & .\jenkins\pipelines\shared\setup_backend.ps1 "$sgUrl"
 
     Write-Host "Windows Web Service: Wait for the Test Server..."
     $urlFile = "servers\jak\webservice\app\server.url"