[jbosstools-commits] JBoss Tools SVN: r18584 - trunk/common/releng/hudson.

Author: nickboldt Date: 2009-11-10 16:43:46 -0500 (Tue, 10 Nov 2009) New Revision: 18584 Modified: trunk/common/releng/hudson/run.sh Log: workaround for https://jira.jboss.org/jira/browse/JBQA-2751 - find x86_64 jvms on 64-bit hudson slaves Modified: trunk/common/releng/hudson/run.sh =================================================================== --- trunk/common/releng/hudson/run.sh 2009-11-10 21:04:56 UTC (rev 18583) +++ trunk/common/releng/hudson/run.sh 2009-11-10 21:43:46 UTC (rev 18584) @@ -19,7 +19,7 @@ ############################################################################################## -uname -a +uname=$(uname -a); echo $uname if [[ -f $HUDSON_CONFIG_DIR/scripts/common/common_bash.sh ]]; then . $HUDSON_CONFIG_DIR/scripts/common/common_bash.sh setant 171 @@ -30,9 +30,17 @@ fi export JAVA14 -export JAVA15 -export JAVA16 +if [[ ${uname/x86_64/} != $uname ]]; then + # 64-bit - must search for the 64-bit JVMs because common_bash.sh fails to load them from ~/config_repository/resources/common.variables + export JAVA15=$(find /qa/tools/opt/x86_64 -maxdepth 2 -name "jdk1.5.*" -type d -not -name "*beta*"| sort | tail -1) + export JAVA16=$(find /qa/tools/opt/x86_64 -maxdepth 2 -name "jdk1.6.*" -type d -not -name "*beta*"| sort | tail -1) +else + # 32-bit - values defined in ~/config_repository/resources/common.variables + export JAVA15 + export JAVA16 +fi + # cache of downloaded requirements and other binaries downloadsDir="${WORKSPACE}/downloads"; if [[ ! -d $downloadsDir ]]; then mkdir -p $downloadsDir; fi