This is an automated email from the ASF dual-hosted git repository.

pgj pushed a commit to branch jenkins-clouseau-windows-test
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit 2ea45cea7a5236bcdf5306a5bcbcfa3aed140271
Author: Gabor Pali <[email protected]>
AuthorDate: Tue Mar 25 20:35:38 2025 +0100

    Enable Clouseau for the Windows CI
    
    Implement the `with_clouseau` flag for the Windows worker and make
    other adjustments to unblock running `erl_call` for pinging the
    Clouseau nodes.  The `elixir-search` target could be safely run
    unconditionally, the `Makefile` is going to skip the tests when
    Clouseau is not present.
---
 build-aux/Jenkinsfile.full | 65 +++++++++++++++++++++++++++-------------------
 1 file changed, 38 insertions(+), 27 deletions(-)

diff --git a/build-aux/Jenkinsfile.full b/build-aux/Jenkinsfile.full
index 479aec7ea..026efd5d2 100644
--- a/build-aux/Jenkinsfile.full
+++ b/build-aux/Jenkinsfile.full
@@ -134,6 +134,7 @@ meta = [
   'win2022': [
     name: 'Windows 2022',
     spidermonkey_vsn: '128',
+    with_clouseau: true,
     node_label: 'win'
   ]
 ]
@@ -228,33 +229,43 @@ def generateNativeStage(platform) {
                 powershell( script: "git clone 
https://github.com/apache/couchdb-glazier";, label: 'Cloning couchdb-glazier 
repository' )
                 powershell( script: "New-Item -ItemType Directory -Path 
'${platform}/build' -Force", label: 'Create build directories' )
                 powershell( script: "tar -xf (Get-Item 
apache-couchdb-*.tar.gz) -C '${platform}/build' --strip-components=1", label: 
'Unpack release' )
-                dir( "${platform}/build" ) {
-                  powershell( script: """
-                    .\\..\\..\\couchdb-glazier\\bin\\shell.ps1
-                    .\\configure.ps1 -SkipDeps -WithNouveau 
-SpiderMonkeyVersion ${meta[platform].spidermonkey_vsn}
-                    Set-Item -Path env:GRADLE_OPTS -Value 
'-Dorg.gradle.daemon=false'
-                    make -f Makefile.win release
-                  """, label: 'Configure and Build')
-
-                  //powershell( script: 
".\\..\\..\\couchdb-glazier\\bin\\shell.ps1; make -f Makefile.win eunit", 
label: 'EUnit tests')
-                  //powershell( script: 
".\\..\\..\\couchdb-glazier\\bin\\shell.ps1; make -f Makefile.win elixir", 
label: 'Elixir tests')
-
-                  powershell( script: '& 
.\\..\\..\\couchdb-glazier\\bin\\shell.ps1; Write-Host "NOT AVAILABLE: make -f 
Makefile.win elixir-search"', label: 'N/A Clouseau tests')
-
-                  powershell( script: """
-                    .\\..\\..\\couchdb-glazier\\bin\\shell.ps1
-                    Set-Item -Path env:GRADLE_OPTS -Value 
'-Dorg.gradle.daemon=false'
-                    make -f Makefile.win mango-test
-                  """, label: 'Mango tests')
-
-                  powershell( script: 
'.\\..\\..\\couchdb-glazier\\bin\\shell.ps1; Write-Host "NOT AVAILABLE: make -f 
Makefile.win weatherreport-test"', label: 'N/A Weatherreport tests')
-
-                  // temporary exclude - random flaky tests on Windows
-                  //powershell( script: """
-                  //  .\\..\\..\\couchdb-glazier\\bin\\shell.ps1
-                  //  Set-Item -Path env:GRADLE_OPTS -Value 
'-Dorg.gradle.daemon=false'
-                  //  make -f Makefile.win nouveau-test
-                  //""", label: 'Nouveau tests')
+                withEnv([
+                  "HOMEPATH=${env.HOME}"
+                ]) {
+                  dir( "${platform}/build" ) {
+                    withClouseau = meta[platform].with_clouseau ? 
'-WithClouseau' : ''
+
+                    powershell( script: """
+                      .\\..\\..\\couchdb-glazier\\bin\\shell.ps1
+                      .\\configure.ps1 -SkipDeps -WithNouveau ${withClouseau} 
-SpiderMonkeyVersion ${meta[platform].spidermonkey_vsn}
+                      Set-Item -Path env:GRADLE_OPTS -Value 
'-Dorg.gradle.daemon=false'
+                      make -f Makefile.win release
+                    """, label: 'Configure and Build')
+
+                    //powershell( script: 
".\\..\\..\\couchdb-glazier\\bin\\shell.ps1; make -f Makefile.win eunit", 
label: 'EUnit tests')
+                    //powershell( script: 
".\\..\\..\\couchdb-glazier\\bin\\shell.ps1; make -f Makefile.win elixir", 
label: 'Elixir tests')
+
+                    powershell( script: """
+                      .\\..\\..\\couchdb-glazier\\bin\\shell.ps1
+                      Set-Item -Path env:GRADLE_OPTS -Value 
'-Dorg.gradle.daemon=false'
+                      make -f Makefile.win elixir-search
+                    """, label: 'Clouseau tests')
+
+                    powershell( script: """
+                      .\\..\\..\\couchdb-glazier\\bin\\shell.ps1
+                      Set-Item -Path env:GRADLE_OPTS -Value 
'-Dorg.gradle.daemon=false'
+                      make -f Makefile.win mango-test
+                    """, label: 'Mango tests')
+
+                    powershell( script: 
'.\\..\\..\\couchdb-glazier\\bin\\shell.ps1; Write-Host "NOT AVAILABLE: make -f 
Makefile.win weatherreport-test"', label: 'N/A Weatherreport tests')
+
+                    // temporary exclude - random flaky tests on Windows
+                    //powershell( script: """
+                    //  .\\..\\..\\couchdb-glazier\\bin\\shell.ps1
+                    //  Set-Item -Path env:GRADLE_OPTS -Value 
'-Dorg.gradle.daemon=false'
+                    //  make -f Makefile.win nouveau-test
+                    //""", label: 'Nouveau tests')
+                  }
                 }
 
                 powershell( script: """

Reply via email to