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

Author: nickboldt Date: 2009-11-12 14:28:57 -0500 (Thu, 12 Nov 2009) New Revision: 18665 Modified: trunk/common/releng/hudson/run.sh Log: collect Hudson's version of Java as defined globally for a given node Modified: trunk/common/releng/hudson/run.sh =================================================================== --- trunk/common/releng/hudson/run.sh 2009-11-12 19:16:15 UTC (rev 18664) +++ trunk/common/releng/hudson/run.sh 2009-11-12 19:28:57 UTC (rev 18665) @@ -29,20 +29,9 @@ export ANT_HOME=/opt/apache-ant-1.7.1 fi -# 32-bit - values defined in ~/config_repository/resources/common.variables -export JAVA14 -export JAVA15 -export JAVA16 +# collect Hudson's version of Java as defined globally for a given node +MY_JAVA_HOME=${JAVA_HOME} -# override for 64-bit slaves - must search for the 64-bit JVMs because common_bash.sh fails to load them from ~/config_repository/resources/common.variables -# workaround for https://jira.jboss.org/jira/browse/JBQA-2751 -if [[ ${uname/x86_64/} != $uname ]]; then - d=$(find /qa/tools/opt/x86_64 -maxdepth 2 -name "jdk1.5.*" -type d -not -name "*beta*"| sort | tail -1) - if [[ $d ]]; then export JAVA15=$d; fi - d=$(find /qa/tools/opt/x86_64 -maxdepth 2 -name "jdk1.6.*" -type d -not -name "*beta*"| sort | tail -1) - if [[ $d ]]; then export JAVA16=$d; fi -fi - # cache of downloaded requirements and other binaries downloadsDir="${WORKSPACE}/downloads"; if [[ ! -d $downloadsDir ]]; then mkdir -p $downloadsDir; fi