river-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sijs...@apache.org
Subject svn commit: r1384740 - in /river/jtsk/trunk: hudson.xml qa-matrix/build.xml
Date Fri, 14 Sep 2012 12:29:09 GMT
Author: sijskes
Date: Fri Sep 14 12:29:09 2012
New Revision: 1384740

URL: http://svn.apache.org/viewvc?rev=1384740&view=rev
Log:
integration fixes

Modified:
    river/jtsk/trunk/hudson.xml
    river/jtsk/trunk/qa-matrix/build.xml

Modified: river/jtsk/trunk/hudson.xml
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/hudson.xml?rev=1384740&r1=1384739&r2=1384740&view=diff
==============================================================================
--- river/jtsk/trunk/hudson.xml (original)
+++ river/jtsk/trunk/hudson.xml Fri Sep 14 12:29:09 2012
@@ -81,23 +81,33 @@
         <verify-signature signature="dep-libs/animal-sniffer/java15-ibm-1.0.signature"
/>
     </target>
 
-    <target name="qa-tree" description="build QA tree" >
+    <target name="qa-tree" depends="qa-tree-build, qa-tree-zip" description="build QA
tree" >
+    </target>
+    
+    <target name="qa-tree-build" description="build QA tree" >
         <ant dir="qa" inheritall="false">
             <target name="clean" />
             <target name="harness-runtime" />
         </ant>
-        <delete file="harness-runtime.jar" />
-        <jar destfile="harness-runtime.jar" index="false">
+    </target>
+
+    <target name="qa-tree-zip" description="Zip QA tree" >
+        <property name="qa-tree-zipfile" value="build/qa-tree.zip" />
+        <delete file="${qa-tree-zipfile}" />
+        <zip destfile="${qa-tree-zipfile}" >
             <fileset dir=".">
+                <!--
                 <include name="lib/**" />
                 <include name="lib-dl/**"/>
                 <include name="lib-ext/**"/>
                 <include name="qa/lib/**" />
                 <include name="qa/lib-ext/**"/>
+                <include name="*.*"/>
+                -->
             </fileset>
-        </jar>
+        </zip>
     </target>
-
+    
     <target name="run-qa" description="execute QA test" >
         <property name="harness-runtime-src" value="https://builds.apache.org/view/M-R/view/River/job/River-QA-runtime/lastSuccessfulBuild/artifact/jtsk/trunk/harness-runtime.jar"
/>
         <property name="harness-runtime-dst" value="harness-runtime.jar" />

Modified: river/jtsk/trunk/qa-matrix/build.xml
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa-matrix/build.xml?rev=1384740&r1=1384739&r2=1384740&view=diff
==============================================================================
--- river/jtsk/trunk/qa-matrix/build.xml (original)
+++ river/jtsk/trunk/qa-matrix/build.xml Fri Sep 14 12:29:09 2012
@@ -37,7 +37,7 @@
     
     <target name="qa-tree" >
         <property name="harness-runtime-dst" value="tmp/qa-tree.zip" />
-        <property name="harness-runtime-src" value="https://builds.apache.org/view/M-R/view/River/job/River-QA-runtime/lastSuccessfulBuild/artifact/jtsk/trunk/harness-runtime.jar"
/>
+        <property name="harness-runtime-src" value="https://builds.apache.org/job/River-QA-tree/lastSuccessfulBuild/artifact/jtsk/trunk/build/qa-tree.zip"
/>
 
         <delete dir="tmp" />
         <mkdir dir="tmp" />



Mime
View raw message