[jboss-svn-commits] JBL Code SVN: r35028 - labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Sep 6 12:30:30 EDT 2010
Author: whitingjr
Date: 2010-09-06 12:30:29 -0400 (Mon, 06 Sep 2010)
New Revision: 35028
Modified:
labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-api.xml
Log:
Added check to detect which messaging implementation is being used.
Modified: labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-api.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-api.xml 2010-09-06 16:17:41 UTC (rev 35027)
+++ labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-api.xml 2010-09-06 16:30:29 UTC (rev 35028)
@@ -12,8 +12,8 @@
permissions and limitations under the License.
-->
<!--
- This file contains the low level api that should not be called
- on the command line directly.
+ This file contains the low level api that should not be called
+ on the command line directly.
-->
<project name="RedHat-JBoss-Performance:API" default="usage" basedir=".">
@@ -90,6 +90,24 @@
</target>
<target name="start-benchmark">
+ <!--tstamp property="run.start.timestamp" pattern="HH:mm:ss EEE dd MM yyyy"/>
+ <groovy>
+ jtimestamp = new Date().time
+ def timestampFile = new File("${properties['spec.install.dir']}/output/${properties['org.spec.internal.runId']}/${properties['timestamp.file.name']}")
+ timestampFile.write("start.timestamp=${properties['run.start.timestamp']}")
+ timestampFile.append('\n')
+ timestampFile.append("start.jtimestamp=")
+ timestampFile.append(jtimestamp)
+ timestampFile.append('\n')
+ </groovy>
+
+
+ <copy file="src/main/resources/timestamp/run-start.properties" todir="${spec.install.dir}/output/${org.spec.internal.runId}">
+ <filterchain>
+ <expandproperties />
+ </filterchain>
+ </copy-->
+
<parallel failonany="true">
<echo>starting Controller</echo>
@@ -121,16 +139,16 @@
<target name="gather-logs">
<echo>Gathering log files</echo>
<parallel failonany="false">
- <scp remotefile="${eap.server.username}@${eap.server.host}:/jboss-5.1.0.Branch/server/production/log/jstat-hornetq.txt" localTodir="${spec.install.dir}/output/${org.spec.internal.runId}/config/jstat-hornetq.txt" failonerror="false" password="${eap.server.password}"/>
+ <scp remotefile="${eap.server.username}@${eap.server.host}:${server.deployment.dir}/server/production/log/jstat-hornetq.txt" localTodir="${spec.install.dir}/output/${org.spec.internal.runId}/config/jstat-hornetq.txt" failonerror="false" password="${eap.server.password}"/>
<scp remotefile="${eap.server.username}@${eap.server.host}:/tmp/verbose-gc.txt" localTodir="${spec.install.dir}/output/${org.spec.internal.runId}/config/verbose-gc.txt" failonerror="false" password="${eap.server.password}"/>
- <scp remotefile="${eap.server.username}@${eap.server.host}:/jboss-5.1.0.Branch/server/production/log/server.log" localTodir="${spec.install.dir}/output/${org.spec.internal.runId}/config/server.log" failonerror="false" password="${eap.server.password}"/>
+ <scp remotefile="${eap.server.username}@${eap.server.host}:${server.deployment.dir}/server/production/log/server.log" localTodir="${spec.install.dir}/output/${org.spec.internal.runId}/config/server.log" failonerror="false" password="${eap.server.password}"/>
</parallel>
</target>
<target name="process-gc-stats">
<echo>Processing gc stats</echo>
<if>
- <available file="${spec.install.dir}/output/${org.spec.internal.runId}/config/verbose-gc.txt"/>
+ <available file="${spec.install.dir}/output/${org.spec.internal.runId}/config/verbose-gc.txt"/>
<then>
<exec executable="printgcstats" output="${spec.install.dir}/output/${org.spec.internal.runId}/config/verbose-gc-stats.txt" failonerror="false">
<arg value="-v"/>
@@ -194,18 +212,18 @@
<target name="generate-submission" depends="submission-preparation">
<echo>Checking success of the benchmark run.</echo>
- <if>
+ <if>
<available file="${spec.install.dir}/output/${org.spec.internal.runId}/specjms-result.xml"/>
<then>
- <xmltask source="${spec.install.dir}/output/${org.spec.internal.runId}/specjms-result.xml">
- <copy path="/specjms-result/test/@result" property="benchmark.run.pass" attrValue="true"/>
- </xmltask>
+ <xmltask source="${spec.install.dir}/output/${org.spec.internal.runId}/specjms-result.xml">
+ <copy path="/specjms-result/test/@result" property="benchmark.run.pass" attrValue="true"/>
+ </xmltask>
</then>
<else>
- <property name="benchmark.run.pass" value="false"/>
+ <property name="benchmark.run.pass" value="false"/>
</else>
</if>
-
+
<echo>Status of run was: ${benchmark.run.pass}</echo>
<antcall target="generate-submission-report"/>
@@ -319,10 +337,10 @@
<target name="deploy-payload">
<echo>Checking the payload directory [${payload.dir}] is present.</echo>
<condition property="payload.directory.isAvailable" else="false" value="true">
- <and>
- <isset property="payload.dir"/>
- <available file="${payload.dir}"/>
- </and>
+ <and>
+ <isset property="payload.dir"/>
+ <available file="${payload.dir}"/>
+ </and>
</condition>
<echo>Status of expected property and directory: ${payload.directory.isAvailable}</echo>
<antcall target="deploy.files" inheritall="true"/>
@@ -413,9 +431,9 @@
</antcall>
</then>
</if>
-
- <if>
- <available file="${payload.dir}/specjms.seq"/>
+
+ <if>
+ <available file="${payload.dir}/specjms.seq"/>
<then>
<echo>Deploying specjms.seq</echo>
<antcall target="substitute-local-config">
@@ -442,11 +460,23 @@
<target name="prepare-execution-report">
<echo>Preparing benchmark run results.</echo>
+
+ <if>
+ <available file="${payload.dir}/execution-workload.xml" />
+ <then>
+ <property name="execution-type" value="circular"/>
+ </then>
+ <else>
+ <property name="execution-type" value="linear"/>
+ </else>
+ </if>
+ <property file="${spec.install.dir}/output/${org.spec.internal.runId}/run-start.properties"/>
+
<xslt style="src/main/resources/xsl/result.xsl" in="build.xml" out="${temporary.directory}/execution-result-report.xml">
<param name="controller-id" value="null"/>
- <param name="worker-id" value=""/>
- <param name="type" value=""/>
- <param name="start-datetime" value=""/>
+ <param name="worker-id" value="AFTER_EXECUTION.org.spec.internal.runId"/>
+ <param name="type" value="${execution-type}"/>
+ <param name="start-datetime" value="${start.timestamp}"/><!-- relies on run-start.properties -->
<param name="start-jdatetime" value=""/>
<param name="completion-datetime" value=""/>
<param name="completion-jdatetime" value=""/>
@@ -472,7 +502,7 @@
<echo>Sending the result files.</echo>
</target>
-
+
<target name="purge-jvm">
</target>
More information about the jboss-svn-commits
mailing list