svn commit: r562328 - in /harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot: adaptor.xml parameters.xml snapshots-cc-config.xml suite-cc-custom-config.xml

[va...@apache.org]

Author: varlax
Date: Thu Aug  2 21:50:44 2007
New Revision: 562328

URL: http://svn.apache.org/viewvc?view=rev&rev=562328
Log:
Snapshot adaptor enhanced:
1) Use custom bootstrapper (HARMONY-4290) instead of fully custom config;
2) Added results archiving available for http download

Removed:
    harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/snapshots-cc-config.xml
Modified:
    harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/adaptor.xml
    harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/parameters.xml
    harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/suite-cc-custom-config.xml

Modified: harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/adaptor.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/adaptor.xml?view=diff&rev=562328&r1=562327&r2=562328
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/adaptor.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/adaptor.xml Thu Aug  2 21:50:44 2007
@@ -148,6 +148,10 @@
         <delete dir="${snapshot}" />
     </target>
 
+    <!-- custom bootstrapper implementation -->
+    <target name="bootstrap" depends="download.snapshot"/>
+
+
     <!--                     -->
     <!-- snapshot publishers -->
     <!--                     -->
@@ -170,6 +174,7 @@
                 &lt;/html&gt;
             </footer>
         </concat>
+        <archive-result/>
     </target>
 
     <target name="publish-func">
@@ -179,6 +184,7 @@
             <fileset dir="${results.dir}/func" includes="TEST*-*.xml" />
             <report format="frames" todir="${snapshot.results.dir}/func" />
         </junitreport>
+        <archive-result/>
     </target>
 
     <target name="publish-JettyScenario">
@@ -188,6 +194,7 @@
                 <include name="**" />
             </fileset>
         </copy>
+        <archive-result/>
     </target>
 
     <target name="publish-dacapo">
@@ -211,6 +218,7 @@
                 &lt;/html&gt;
             </footer>
         </concat>
+        <archive-result/>
     </target>
 
     <target name="publish-ehwa">
@@ -231,6 +239,7 @@
                 &lt;/html&gt;
             </footer>
         </concat>
+        <archive-result/>
     </target>
 
     <target name="publish-gut">
@@ -240,6 +249,7 @@
                      includes="**/surefire-reports/TEST*-*.xml" />
             <report format="frames" todir="${snapshot.results.dir}/gut" />
         </junitreport>
+        <archive-result/>
     </target>
 
     <target name="publish-scimark">
@@ -261,6 +271,7 @@
                 &lt;/html&gt;
             </footer>
         </concat>
+        <archive-result/>
     </target>
 
     <target name="publish-stress">
@@ -270,6 +281,7 @@
             <fileset dir="${results.dir}/stress" includes="TEST*-*.xml" />
             <report format="frames" todir="${snapshot.results.dir}/stress" />
         </junitreport>
+        <archive-result/>
     </target>
 
     <target name="publish-struts_test">
@@ -279,6 +291,7 @@
                 <include name="**" />
             </fileset>
         </copy>
+        <archive-result/>
     </target>
 
     <target name="publish-tomcat-scenario">
@@ -288,7 +301,18 @@
 NO OUTPUT
 &lt;/html&gt;
         </echo>
+        <archive-result/>
     </target>
+
+
+    <macrodef name="archive-result">
+        <sequential>
+        <property file="${snapshot}/svn.revision" prefix="snapshot"/>
+            <zip destfile="${cc.log.dir}/snapshot-r${snapshot.svn.revision}.status.zip"
+                 basedir="${snapshot.results.dir}"
+                 update="true"/>
+        </sequential>
+    </macrodef>
 
 </project>
 

Modified: harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/parameters.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/parameters.xml?view=diff&rev=562328&r1=562327&r2=562328
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/parameters.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/parameters.xml Thu Aug  2 21:50:44 2007
@@ -1,9 +1,5 @@
 <parameters>
 
-    <required>
-        <file value="${snapshot.file}" />
-    </required>
-
     <shared>
         <results.dir value="${checkouts.dir}/snapshot/results"/>
         <jre value="${checkouts.dir}/snapshot/hdk/jdk/jre"/>
@@ -12,5 +8,9 @@
         <svn.revision.file location="${checkouts.dir}/snapshot/svn.revision"/>
     </shared>
 
-    <cc config="${adaptors.dir}/${suite.name}/snapshots-cc-config.xml"/>
+    <mail summary="${svn.revision.file}"/>
+
+    <cc trigger="${snapshot}/${snapshot.file}"
+        bootstrapper="${suite.adaptor.dir}/adaptor.xml"
+    />
 </parameters>

Modified: harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/suite-cc-custom-config.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/suite-cc-custom-config.xml?view=diff&rev=562328&r1=562327&r2=562328
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/suite-cc-custom-config.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/suite-cc-custom-config.xml Thu Aug  2 21:50:44 2007
@@ -63,6 +63,7 @@
                  target='publish-${project.name}'>
                 <property name='results.dir' value='${results.dir}'/>
                 <property name='checkouts.dir' value='${checkouts.dir}'/>
+                <property name='cc.log.dir' value='${cc.log.dir}'/>
             </antpublisher>
         </publishers>