Author: thomas.diesler(a)jboss.com Date: 2009-02-13 06:13:34 -0500 (Fri, 13 Feb 2009) New Revision: 3866 Modified: jbpm4/trunk/hudson/hudson-home/jobs/jBPM4-Container-Matrix/config.xml jbpm4/trunk/hudson/hudson-home/jobs/jBPM4-Database-Matrix/config.xml jbpm4/trunk/hudson/hudson-home/jobs/jBPM4-JDK1.5/config.xml jbpm4/trunk/hudson/profiles.xml.local.qa Log: Leverage command.sh in container and database matrix tests Modified: jbpm4/trunk/hudson/hudson-home/jobs/jBPM4-Container-Matrix/config.xml =================================================================== --- jbpm4/trunk/hudson/hudson-home/jobs/jBPM4-Container-Matrix/config.xml 2009-02-13 10:49:27 UTC (rev 3865) +++ jbpm4/trunk/hudson/hudson-home/jobs/jBPM4-Container-Matrix/config.xml 2009-02-13 11:13:34 UTC (rev 3866) @@ -21,23 +21,23 @@ <disabled>false</disabled> <triggers class="vector"> <hudson.triggers.TimerTrigger> - <spec>1 3 * * *</spec> + <spec>5 4 * * *</spec> </hudson.triggers.TimerTrigger> </triggers> <axes> <axis> - <name>database</name> + <name>CONTAINER</name> <values> - <string>mysql</string> - <string>hsqldb</string> + <string>jboss422</string> + <string>jboss423</string> + <string>jboss500</string> </values> </axis> <axis> - <name>container</name> + <name>DATABASE</name> <values> - <string>jboss422</string> - <string>jboss423</string> - <string>jboss500</string> + <string>mysql</string> + <string>hsqldb</string> </values> </axis> <axis> @@ -50,13 +50,34 @@ </axes> <builders> <hudson.tasks.Shell> - <command>/bin/sh ./jbpm4/hudson/jbpm4-base.sh</command> + <command>WORKSPACE=`pwd` +JBPMDIR=$WORKSPACE/jbpm4 + +export HUDSON_BASE=/home/hudson/workspace/jbpm-hudson-4.0.0-SNAPSHOT +export JBPM_VERSION=4.0.0-SNAPSHOT +export JBOSS_SERVER=default +export JBOSS_BINDADDR=192.168.0.101 + +# copy the maven profile +cp $JBPMDIR/hudson/profiles.xml.local.qa $JBPMDIR/profiles.xml + +# +# call command.sh +# +/bin/sh $JBPMDIR/hudson/hudson-home/command.sh + + </command> </hudson.tasks.Shell> </builders> <publishers> <hudson.tasks.junit.JUnitResultArchiver> <testResults>jbpm4/modules/**/target/surefire-reports/TEST-*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> + <hudson.tasks.Mailer> + <recipients&gt;hbraun(a)redhat.com&lt;/recipients&gt; + <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> + <sendToIndividuals>false</sendToIndividuals> + </hudson.tasks.Mailer> </publishers> <buildWrappers/> </matrix-project> \ No newline at end of file Modified: jbpm4/trunk/hudson/hudson-home/jobs/jBPM4-Database-Matrix/config.xml =================================================================== --- jbpm4/trunk/hudson/hudson-home/jobs/jBPM4-Database-Matrix/config.xml 2009-02-13 10:49:27 UTC (rev 3865) +++ jbpm4/trunk/hudson/hudson-home/jobs/jBPM4-Database-Matrix/config.xml 2009-02-13 11:13:34 UTC (rev 3866) @@ -21,21 +21,21 @@ <disabled>false</disabled> <triggers class="vector"> <hudson.triggers.TimerTrigger> - <spec>1 4 * * *</spec> + <spec>5 6 * * *</spec> </hudson.triggers.TimerTrigger> </triggers> <axes> <axis> - <name>database</name> + <name>CONTAINER</name> <values> - <string>mysql</string> - <string>hsqldb</string> + <string>jboss500</string> </values> </axis> <axis> - <name>container</name> + <name>DATABASE</name> <values> - <string>jboss500</string> + <string>mysql</string> + <string>hsqldb</string> </values> </axis> <axis> @@ -48,13 +48,32 @@ </axes> <builders> <hudson.tasks.Shell> - <command>/bin/sh ./jbpm4/hudson/jbpm4-base.sh</command> + <command>WORKSPACE=`pwd` +JBPMDIR=$WORKSPACE/jbpm4 + +export HUDSON_BASE=/home/hudson/workspace/jbpm-hudson-4.0.0-SNAPSHOT +export JBPM_VERSION=4.0.0-SNAPSHOT +export JBOSS_SERVER=default +export JBOSS_BINDADDR=192.168.0.101 + +# copy the maven profile +cp $JBPMDIR/hudson/profiles.xml.local.qa $JBPMDIR/profiles.xml + +# +# call command.sh +# +/bin/sh $JBPMDIR/hudson/hudson-home/command.sh </command> </hudson.tasks.Shell> </builders> <publishers> <hudson.tasks.junit.JUnitResultArchiver> <testResults>jbpm4/modules/**/target/surefire-reports/TEST-*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> + <hudson.tasks.Mailer> + <recipients&gt;hbraun(a)redhat.com&lt;/recipients&gt; + <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> + <sendToIndividuals>false</sendToIndividuals> + </hudson.tasks.Mailer> </publishers> <buildWrappers/> </matrix-project> \ No newline at end of file Modified: jbpm4/trunk/hudson/hudson-home/jobs/jBPM4-JDK1.5/config.xml =================================================================== --- jbpm4/trunk/hudson/hudson-home/jobs/jBPM4-JDK1.5/config.xml 2009-02-13 10:49:27 UTC (rev 3865) +++ jbpm4/trunk/hudson/hudson-home/jobs/jBPM4-JDK1.5/config.xml 2009-02-13 11:13:34 UTC (rev 3866) @@ -46,13 +46,13 @@ WORKSPACE=`pwd` JBPMDIR=$WORKSPACE/jbpm4 -export HUDSON_BASE=(a)hudson.base@ -export JBPM_VERSION=(a)version.id@ -export JBOSS_SERVER=(a)jboss.server.instance@ -export JBOSS_BINDADDR=(a)jboss.bind.address@ +export HUDSON_BASE=/home/hudson/workspace/jbpm-hudson-4.0.0-SNAPSHOT +export JBPM_VERSION=4.0.0-SNAPSHOT +export JBOSS_SERVER=default +export JBOSS_BINDADDR=192.168.0.101 # copy the maven profile -cp @hudson.maven.profile@ $JBPMDIR/profiles.xml +cp $JBPMDIR/hudson/profiles.xml.local.qa $JBPMDIR/profiles.xml # # call command.sh Modified: jbpm4/trunk/hudson/profiles.xml.local.qa =================================================================== --- jbpm4/trunk/hudson/profiles.xml.local.qa 2009-02-13 10:49:27 UTC (rev 3865) +++ jbpm4/trunk/hudson/profiles.xml.local.qa 2009-02-13 11:13:34 UTC (rev 3866) @@ -17,12 +17,12 @@ <!-- JBOSS_HOME FOR INTEGRATION TESTS + --> - <jboss422.home>/Users/hbraun/dev/prj/jboss/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA</jboss422.home> <jboss423.home>/Users/hbraun/dev/prj/jboss/tags/JBoss_4_2_3_GA/build/output/jboss-4.2.3.GA</jboss423.home> <jboss500.home>/Users/hbraun/dev/prj/jboss/tags/JBoss_5_0_0_GA/build/output/jboss-5.0.0.GA</jboss500.home> - --> + <!-- DEFAULT CONNECTION SETTINGS FOR THE JBPM QA ENV --> @@ -57,41 +57,15 @@ <jdbc.sybase.driver>com.sybase.jdbc3.jdbc.SybDriver</jdbc.sybase.driver> <jdbc.sybase.datasource>com.sybase.jdbc3.jdbc.SybXADataSource</jdbc.sybase.datasource> + <jdbc.oracle.server>localhost</jdbc.oracle.server> + <jdbc.oracle.port>1521</jdbc.oracle.port> + <jdbc.oracle.database>jbpm4</jdbc.oracle.database> + <jdbc.oracle.username>jbpmtest</jdbc.oracle.username> + <jdbc.oracle.password></jdbc.oracle.password> + <jdbc.oracle.url>jdbc:oracle:thin:${jdbc.oracle.username}/${jdbc.oracle.password}@${jdbc.oracle.server}:${jdbc.oracle.port}:${jdbc.oracle.database}</jdbc.oracle.url> </properties> </profile> - <profile> - <id>oracle-private-properties</id> - <activation> - <property> - <name>database</name> - <value>oracle</value> - </property> - </activation> - <properties> - <jdbc.username>xxxx</jdbc.username> - <jdbc.password>xxxx</jdbc.password> - <jdbc.server>localhost</jdbc.server> - <jdbc.dbname>XE</jdbc.dbname> - </properties> - </profile> - - <profile> - <id>mysql-private-properties</id> - <activation> - <property> - <name>database</name> - <value>mysql</value> - </property> - </activation> - <properties> - <jdbc.username>xxxx</jdbc.username> - <jdbc.password>xxxx</jdbc.password> - <jdbc.server>localhost</jdbc.server> - <jdbc.dbname>JBPM</jdbc.dbname> - </properties> - </profile> - </profiles> </profilesXml>