More windows fixes (#85)

couchbaselabs · Nov 4, 2024 · f510465 · f510465
1 parent 0918e17
commit f510465
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 20 deletions.
diff --git a/jenkins/pipelines/java/Jenkinsfile b/jenkins/pipelines/java/Jenkinsfile
@@ -27,7 +27,7 @@ pipeline {
                 stage('OSX Tests') {
                     agent { label 'mob-e2e-mac-01' }
                     options {
-                        timeout(time: 45, unit: 'MINUTES')
+                        // timeout(time: 60, unit: 'MINUTES')
                         lock("mob-e2e-mac-01")
                     }
                     stages {
@@ -52,22 +52,22 @@ pipeline {
                 stage('Windows Tests') {
                     agent { label 'mob-e2e-win-01' }
                     options {
-                        timeout(time: 45, unit: 'MINUTES')
+                        // timeout(time: 60, unit: 'MINUTES')
                         lock("mob-e2e-win-01")
                     }
                     stages {
                         stage('Windows Desktop Tests') {
                             steps {
                                 echo "Run Windows Java Desktop Tests"
                                 pwsh """
-                                    jenkins/pipelines/java/desktop/win_tests.ps1 "${params.CBL_VERSION}" "${params.CBL_BUILD}" "${params.SGW_URL}"
+                                    jenkins\pipelines\java/desktop\win_tests.ps1 "${params.CBL_VERSION}" "${params.CBL_BUILD}" "${params.SGW_URL}"
                                 """
                             }
                             post {
                                 always {
                                     echo "Teardown Windows Java Desktop Tests"
                                     pwsh '''
-                                        jenkins/pipelines/java/desktop/win_teardown.ps1
+                                        jenkins\pipelines\java/desktop\win_teardown.ps1
                                     '''
                                 }
                             }
@@ -77,7 +77,7 @@ pipeline {
                 stage('Linux Tests') {
                     agent { label 'mob-e2e-deb-02' }
                     options {
-                        timeout(time: 45, unit: 'MINUTES')
+                        // timeout(time: 60, unit: 'MINUTES')
                         lock("mob-e2e-deb-02")
                     }
                     stages {
@@ -106,7 +106,7 @@ pipeline {
                 stage('OSX Tests') {
                     agent { label 'mob-e2e-mac-01' }
                     options {
-                        timeout(time: 60, unit: 'MINUTES')
+                        // timeout(time: 120, unit: 'MINUTES')
                         lock("mob-e2e-mac-01")
                     }
                     stages {
@@ -131,22 +131,22 @@ pipeline {
                 stage('Windows Tests') {
                     agent { label 'mob-e2e-win-01' }
                     options {
-                        timeout(time: 60, unit: 'MINUTES')
+                        // timeout(time: 120, unit: 'MINUTES')
                         lock("mob-e2e-win-01")
                     }
                     stages {
                         stage('Windows Web Services Tests') {
                             steps {
                                 echo "Run Windows Java Web Services Tests"
                                 pwsh """
-                                    jenkins/pipelines/java/webservice/win_tests.ps1 "${params.CBL_VERSION}" "${params.CBL_BUILD}" "${params.SGW_URL}"
+                                    jenkins\pipelines\java\webservice\win_tests.ps1 "${params.CBL_VERSION}" "${params.CBL_BUILD}" "${params.SGW_URL}"
                                 """
                             }
                             post {
                                 always {
                                     echo "Teardown Windows Web Services Tests"
                                     pwsh '''
-                                        jenkins/pipelines/java/webservice/win_teardown.ps1
+                                        jenkins\pipelines\java\webservice\win_teardown.ps1
                                     '''
                                 }
                             }
@@ -156,7 +156,7 @@ pipeline {
                 stage('Linux Tests') {
                     agent { label 'mob-e2e-deb-02' }
                     options {
-                        timeout(time: 60, unit: 'MINUTES')
+                        // timeout(time: 120, unit: 'MINUTES')
                         lock("mob-e2e-deb-02")
                     }
                     stages {

diff --git a/jenkins/pipelines/java/desktop/win_teardown.ps1 b/jenkins/pipelines/java/desktop/win_teardown.ps1
@@ -1,15 +1,13 @@
-#!/bin/bash
-# Clean up after running Java Web Services tests
 
-echo "Shutdown Test Server"
+Write-Host "Shutdown Test Server"
 Push-Location servers\jak\desktop
 if (Test-Path -Path .\server.pid){
     $serverId = Get-Content .\server.pid
     Stop-Process -Id $serverId
 }
 Pop-Location
 
-echo "Shutdown Environment"
+Write-Host "Shutdown Environment"
 Push-Location environment
 & docker compose down
 
diff --git a/jenkins/pipelines/java/desktop/win_tests.ps1 b/jenkins/pipelines/java/desktop/win_tests.ps1
@@ -65,7 +65,7 @@ Get-Content config_java_desktop.json
 Write-Host "Running tests on desktop test server at $serverUrl"
 & python3.10 -m venv venv
 Set-ExecutionPolicy -ExecutionPolicy Bypass -Scope Process -Force
-./venv/Scripts/activate.ps1
+.\venv\Scripts\activate.ps1
 pip install -r requirements.txt
 
 Write-Host "Run tests"

diff --git a/jenkins/pipelines/java/webservice/win_teardown.ps1 b/jenkins/pipelines/java/webservice/win_teardown.ps1
@@ -1,13 +1,11 @@
-#!/bin/bash
-# Clean up after running Java Web Services tests
 
-echo "Shutdown Test Server"
+Write-Host "Shutdown Test Server"
 Push-Location servers\jak\desktop
 & .\gradlew.bat --no-daemon appStop
 Remove-Item app\server.url
 Pop-Location
 
-echo "Shutdown Environment"
+Write-Host "Shutdown Environment"
 Push-Location environment
 & docker compose down
 
diff --git a/jenkins/pipelines/java/webservice/win_tests.ps1 b/jenkins/pipelines/java/webservice/win_tests.ps1
@@ -59,7 +59,7 @@ Get-Content config_java_webservice.json
 Write-Host "Running tests on desktop test server at $SERVER_URL"
 & python3.10 -m venv venv
 Set-ExecutionPolicy -ExecutionPolicy Bypass -Scope Process -Force
-./venv/Scripts/activate.ps1
+.\venv\Scripts\activate.ps1
 pip install -r requirements.txt
 
 Write-Host "Run tests"