You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2010/10/04 12:12:45 UTC
svn commit: r1004183 - in /lucene/dev/nightly: hudson-lucene-3.x.sh
hudson-lucene-trunk.sh hudson-settings.sh hudson-solr-3.x.sh
hudson-solr-trunk.sh
Author: uschindler
Date: Mon Oct 4 10:12:45 2010
New Revision: 1004183
URL: http://svn.apache.org/viewvc?rev=1004183&view=rev
Log:
We now temporary fix the hudson builds by enforcing compilations only with Java 1.5 for Lucene and Solr 3.x, but run all tests and clover with Java 1.6
Modified:
lucene/dev/nightly/hudson-lucene-3.x.sh
lucene/dev/nightly/hudson-lucene-trunk.sh
lucene/dev/nightly/hudson-settings.sh
lucene/dev/nightly/hudson-solr-3.x.sh
lucene/dev/nightly/hudson-solr-trunk.sh
Modified: lucene/dev/nightly/hudson-lucene-3.x.sh
URL: http://svn.apache.org/viewvc/lucene/dev/nightly/hudson-lucene-3.x.sh?rev=1004183&r1=1004182&r2=1004183&view=diff
==============================================================================
--- lucene/dev/nightly/hudson-lucene-3.x.sh (original)
+++ lucene/dev/nightly/hudson-lucene-3.x.sh Mon Oct 4 10:12:45 2010
@@ -20,27 +20,27 @@ cd $WORKSPACE/$SVN_BRANCH_DIR
echo "Workspace: $WORKSPACE"
-#Package the Source
-$ANT_HOME/bin/ant -Dversion=$VERSION \
+#Package the Source and compile Binaries
+JAVA_HOME=$JAVA_HOME_15 $ANT_HOME/bin/ant -Dversion=$VERSION \
-Dsvnversion.exe=$SVNVERSION_EXE \
-Dsvn.exe=$SVN_EXE \
- clean package-tgz-src
+ clean package-tgz-src package-tgz
# release it
cp dist/*-src.tar.gz $ARTIFACTS
-# run build
-$ANT_HOME/bin/ant \
+# run tests
+JAVA_HOME=$JAVA_HOME_16 $ANT_HOME/bin/ant \
-Dsvnversion.exe=$SVNVERSION_EXE \
-Dsvn.exe=$SVN_EXE \
-Dversion=$VERSION \
-Dtests.threadspercpu=0 \
-Dtests.multiplier=3 \
- test package-tgz
+ test
# release it
cp dist/*.tar.gz $ARTIFACTS
#Generate the Maven snapshot
-$ANT_HOME/bin/ant \
+JAVA_HOME=$JAVA_HOME_15 $ANT_HOME/bin/ant \
-Dsvnversion.exe=$SVNVERSION_EXE \
-Dsvn.exe=$SVN_EXE \
-Dversion=$MAVEN_ARTIFACT_VERSION \
@@ -52,7 +52,7 @@ echo "Done Copying Maven Artifacts"
#Rerun testsuite with clover on
set +e
-$ANT_HOME/bin/ant \
+JAVA_HOME=$JAVA_HOME_16 $ANT_HOME/bin/ant \
-lib $CLOVER \
-Dsvnversion.exe=$SVNVERSION_EXE \
-Dsvn.exe=$SVN_EXE \
@@ -65,7 +65,7 @@ RET=$?
set -e
#generate the clover reports and javadocs even when tests failed before
-ANT_OPTS="-Xmx896M" $ANT_HOME/bin/ant \
+JAVA_HOME=$JAVA_HOME_16 ANT_OPTS="-Xmx896M" $ANT_HOME/bin/ant \
-lib $CLOVER \
-Dsvnversion.exe=$SVNVERSION_EXE \
-Dsvn.exe=$SVN_EXE \
@@ -74,10 +74,10 @@ ANT_OPTS="-Xmx896M" $ANT_HOME/bin/ant \
generate-clover-reports
#build javadocs & changes again
-$ANT_HOME/bin/ant -Dversion=$VERSION \
+JAVA_HOME=$JAVA_HOME_15 $ANT_HOME/bin/ant -Dversion=$VERSION \
-Dsvnversion.exe=$SVNVERSION_EXE \
-Dsvn.exe=$SVN_EXE \
- javadocs changes-to-html
+ javadocs changes-to-html > /dev/null
# return the test return value
exit $RET
Modified: lucene/dev/nightly/hudson-lucene-trunk.sh
URL: http://svn.apache.org/viewvc/lucene/dev/nightly/hudson-lucene-trunk.sh?rev=1004183&r1=1004182&r2=1004183&view=diff
==============================================================================
--- lucene/dev/nightly/hudson-lucene-trunk.sh (original)
+++ lucene/dev/nightly/hudson-lucene-trunk.sh Mon Oct 4 10:12:45 2010
@@ -19,27 +19,27 @@ cd $WORKSPACE/$SVN_BRANCH_DIR
echo "Workspace: $WORKSPACE"
-#Package the Source
-$ANT_HOME/bin/ant -Dversion=$VERSION \
+#Package the Source and compile Binaries
+JAVA_HOME=$JAVA_HOME_15 $ANT_HOME/bin/ant -Dversion=$VERSION \
-Dsvnversion.exe=$SVNVERSION_EXE \
-Dsvn.exe=$SVN_EXE \
- clean package-tgz-src
+ clean package-tgz-src package-tgz
# release it
cp dist/*-src.tar.gz $ARTIFACTS
-# run build
-$ANT_HOME/bin/ant \
+# run tests
+JAVA_HOME=$JAVA_HOME_16 $ANT_HOME/bin/ant \
-Dsvnversion.exe=$SVNVERSION_EXE \
-Dsvn.exe=$SVN_EXE \
-Dversion=$VERSION \
-Dtests.threadspercpu=0 \
-Dtests.multiplier=3 \
- test package-tgz
+ test
# release it
cp dist/*.tar.gz $ARTIFACTS
#Generate the Maven snapshot
-$ANT_HOME/bin/ant \
+JAVA_HOME=$JAVA_HOME_15 $ANT_HOME/bin/ant \
-Dsvnversion.exe=$SVNVERSION_EXE \
-Dsvn.exe=$SVN_EXE \
-Dversion=$MAVEN_ARTIFACT_VERSION \
@@ -51,7 +51,7 @@ echo "Done Copying Maven Artifacts"
#Rerun testsuite with clover on
set +e
-$ANT_HOME/bin/ant \
+JAVA_HOME=$JAVA_HOME_16 $ANT_HOME/bin/ant \
-lib $CLOVER \
-Dsvnversion.exe=$SVNVERSION_EXE \
-Dsvn.exe=$SVN_EXE \
@@ -64,7 +64,7 @@ RET=$?
set -e
#generate the clover reports and javadocs even when tests failed before
-ANT_OPTS="-Xmx896M" $ANT_HOME/bin/ant \
+JAVA_HOME=$JAVA_HOME_16 ANT_OPTS="-Xmx896M" $ANT_HOME/bin/ant \
-lib $CLOVER \
-Dsvnversion.exe=$SVNVERSION_EXE \
-Dsvn.exe=$SVN_EXE \
@@ -73,10 +73,10 @@ ANT_OPTS="-Xmx896M" $ANT_HOME/bin/ant \
generate-clover-reports
#build javadocs & changes again
-$ANT_HOME/bin/ant -Dversion=$VERSION \
+JAVA_HOME=$JAVA_HOME_15 $ANT_HOME/bin/ant -Dversion=$VERSION \
-Dsvnversion.exe=$SVNVERSION_EXE \
-Dsvn.exe=$SVN_EXE \
- javadocs changes-to-html
+ javadocs changes-to-html > /dev/null
# return the test return value
exit $RET
Modified: lucene/dev/nightly/hudson-settings.sh
URL: http://svn.apache.org/viewvc/lucene/dev/nightly/hudson-settings.sh?rev=1004183&r1=1004182&r2=1004183&view=diff
==============================================================================
--- lucene/dev/nightly/hudson-settings.sh (original)
+++ lucene/dev/nightly/hudson-settings.sh Mon Oct 4 10:12:45 2010
@@ -4,3 +4,7 @@ ANT_HOME=/home/hudson/tools/ant/apache-a
SVNVERSION_EXE=svnversion
SVN_EXE=svn
CLOVER=/home/hudson/tools/clover/clover2latest
+
+# we sometimes ignore hudson-supplied Java version and enforce 1.5 for compilation, but run tests in 1.6:
+JAVA_HOME_15=/home/hudson/tools/java/latest15
+JAVA_HOME_16=/home/hudson/tools/java/latest16
Modified: lucene/dev/nightly/hudson-solr-3.x.sh
URL: http://svn.apache.org/viewvc/lucene/dev/nightly/hudson-solr-3.x.sh?rev=1004183&r1=1004182&r2=1004183&view=diff
==============================================================================
--- lucene/dev/nightly/hudson-solr-3.x.sh (original)
+++ lucene/dev/nightly/hudson-solr-3.x.sh Mon Oct 4 10:12:45 2010
@@ -13,15 +13,21 @@ cd $WORKSPACE/$SVN_SOLR_BRANCH_DIR
echo "Workspace: $WORKSPACE"
-$ANT_HOME/bin/ant \
+JAVA_HOME=$JAVA_HOME_15 $ANT_HOME/bin/ant \
+ -Dversion=$VERSION \
+ -Dlucene_version=$VERSION \
+ -Dsvnversion.exe=$SVNVERSION_EXE \
+ clean set-fsdir create-package
+
+JAVA_HOME=$JAVA_HOME_16 $ANT_HOME/bin/ant \
-Dversion=$VERSION \
-Dlucene_version=$VERSION \
-Dsvnversion.exe=$SVNVERSION_EXE \
-Dtests.threadspercpu=0 \
-Djunit.formatter=xml \
- clean nightly
+ test
-$ANT_HOME/bin/ant \
+JAVA_HOME=$JAVA_HOME_15 $ANT_HOME/bin/ant \
-Dversion=$VERSION \
-Dlucene_version=$VERSION \
-Dsvnversion.exe=$SVNVERSION_EXE \
@@ -34,7 +40,7 @@ $ANT_HOME/bin/ant clean
# back to solr...
cd $WORKSPACE/$SVN_SOLR_BRANCH_DIR
-ANT_OPTS="-Xmx896M" $ANT_HOME/bin/ant \
+JAVA_HOME=$JAVA_HOME_16 ANT_OPTS="-Xmx896M" $ANT_HOME/bin/ant \
-Dversion=$VERSION \
-Dlucene_version=$VERSION \
-lib $CLOVER \
Modified: lucene/dev/nightly/hudson-solr-trunk.sh
URL: http://svn.apache.org/viewvc/lucene/dev/nightly/hudson-solr-trunk.sh?rev=1004183&r1=1004182&r2=1004183&view=diff
==============================================================================
--- lucene/dev/nightly/hudson-solr-trunk.sh (original)
+++ lucene/dev/nightly/hudson-solr-trunk.sh Mon Oct 4 10:12:45 2010
@@ -8,6 +8,8 @@ VERSION=4.0-$BUILD_ID
SVN_SOLR_BRANCH_DIR=trunk/solr
SVN_LUCENE_BRANCH_DIR=trunk/lucene
+JAVA_HOME=$JAVA_HOME_16
+export JAVA_HOME
cd $WORKSPACE/$SVN_SOLR_BRANCH_DIR