Author: ozizka(a)redhat.com Date: 2009-09-21 15:39:46 -0400 (Mon, 21 Sep 2009) New Revision: 753 Modified: trunk/jsfunit/testdata/hudson_shell_script.sh Log: * hudson script - Added $M2_SETTINGS to be used as `mvn $M2_SETTINGS` Modified: trunk/jsfunit/testdata/hudson_shell_script.sh =================================================================== --- trunk/jsfunit/testdata/hudson_shell_script.sh 2009-09-18 23:41:50 UTC (rev 752) +++ trunk/jsfunit/testdata/hudson_shell_script.sh 2009-09-21 19:39:46 UTC (rev 753) @@ -35,7 +35,16 @@ ### List JVMs jps -l +### M2_SETTINGS +M2_SETTINGS_PATH=$HOME"/.m2/settings.xml" +if [ -n USERPROFILE ] ; then # Windows + M2_SETTINGS_PATH="h:\\hudson\\.m2\\settings.xml" +fi +M2_SETTINGS_PATH="${HOME}${SEP}settings.xml" +M2_SETTINGS="-s ${M2_SETTINGS_PATH}" + + cd embjopr # "Downdate" to older version svn_rev_default="HEAD" @@ -61,7 +70,7 @@ if [ -n "$DONT_SPLIT" ] ; then echo "Running whole testsuite... (DONT_SPLIT)" - mvn -Pjboss5x -Pfoo$ADD_PROFILES install -Dcargo.jboss.configuration=$JBOSS_CONFIG -Dhtmlunit.browser=$BROWSER --fail-never --update-snapshots -DJBOSS_HOME=$JBOSS_HOME -Dcargo.jboss.bind.address=$MYTESTIP_1 + mvn $M2_SETTINGS -Pjboss5x -Pfoo$ADD_PROFILES install -Dcargo.jboss.configuration=$JBOSS_CONFIG -Dhtmlunit.browser=$BROWSER --fail-never --update-snapshots -DJBOSS_HOME=$JBOSS_HOME -Dcargo.jboss.bind.address=$MYTESTIP_1 else ## Include functions for Hudson. . ~/config_repository/scripts/common/common_bash.sh @@ -74,7 +83,7 @@ echo "Killing JBoss AS..." kill-jboss rm -rf target/jboss5x # Empty Cargo's configuration dir - mvn -Pjboss5x -Pfoo$ADD_PROFILES install -Dcargo.jboss.configuration=$JBOSS_CONFIG -Dhtmlunit.browser=$BROWSER --fail-never --update-snapshots -DJBOSS_HOME=$JBOSS_HOME -Dcargo.jboss.bind.address=$MYTESTIP_1 + mvn $M2_SETTINGS -Pjboss5x -Pfoo$ADD_PROFILES install -Dcargo.jboss.configuration=$JBOSS_CONFIG -Dhtmlunit.browser=$BROWSER --fail-never --update-snapshots -DJBOSS_HOME=$JBOSS_HOME -Dcargo.jboss.bind.address=$MYTESTIP_1 #mv target/surefire-reports/TEST-TestSuite.xml TEST-TestSuite-$part.xml mv target target-$part done