You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by pg...@apache.org on 2025/03/25 14:03:37 UTC

(couchdb) branch jenkins-clouseau-2.25.0 updated: Add support for setting `CLOUSEAU_JAVA_HOME`

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

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


The following commit(s) were added to refs/heads/jenkins-clouseau-2.25.0 by this push:
     new 64b863f31 Add support for setting `CLOUSEAU_JAVA_HOME`
64b863f31 is described below

commit 64b863f315f8cc02fea219e135c43feb91e49898
Author: Gabor Pali <ga...@ibm.com>
AuthorDate: Tue Mar 25 15:03:04 2025 +0100

    Add support for setting `CLOUSEAU_JAVA_HOME`
---
 Makefile                   | 1 +
 build-aux/Jenkinsfile.full | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 5dd299332..dfe379a2e 100644
--- a/Makefile
+++ b/Makefile
@@ -277,6 +277,7 @@ elixir-search: export MIX_ENV=integration
 elixir-search: elixir-init devclean
 ifneq ($(_WITH_CLOUSEAU), )
 	@echo "CLOUSEAU_JAVA_HOME=$(CLOUSEAU_JAVA_HOME)"
+	pkg info || /usr/bin/true
 	find /usr/local/openjdk8 || /usr/bin/true
 	find /opt/java/openjdk8 || /usr/bin/true
 	java -version || /usr/bin/true
diff --git a/build-aux/Jenkinsfile.full b/build-aux/Jenkinsfile.full
index f5180577e..0ecf82c1e 100644
--- a/build-aux/Jenkinsfile.full
+++ b/build-aux/Jenkinsfile.full
@@ -27,6 +27,7 @@ meta = [
       name: 'FreeBSD x86_64',
       spidermonkey_vsn: '91',
       with_clouseau: true,
+      clouseau_java_home: '/usr/local/openjdk8',
       gnu_make: 'gmake'
   ],
 
@@ -35,6 +36,7 @@ meta = [
     spidermonkey_vsn: '128',
     with_nouveau: false,
     with_clouseau: true,
+    clouseau_java_home: '/opt/java/openjdk8/zulu-8.jre/Contents/Home',
     gnu_make: 'make'
   ]
 ]
@@ -81,7 +83,8 @@ def generateNativeStage(platform) {
               withEnv([
                 'HOME='+pwd(),
                 'PATH+USRLOCAL=/usr/local/bin',
-                'MAKE='+meta[platform].gnu_make
+                'MAKE='+meta[platform].gnu_make,
+                'CLOUSEAU_JAVA_HOME='+meta[platform].clouseau_java_home
               ]) {
                 sh( script: "mkdir -p ${platform}/build", label: 'Create build directories' )
                 sh( script: "tar -xf apache-couchdb-*.tar.gz -C ${platform}/build --strip-components=1", label: 'Unpack release' )