geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r502270 - /geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/Controller.groovy
Date Thu, 01 Feb 2007 16:36:45 GMT
Author: jdillon
Date: Thu Feb  1 08:36:44 2007
New Revision: 502270

URL: http://svn.apache.org/viewvc?view=rev&rev=502270
Log:
Fixed up zip of runtests results, optimized legacy report handing of summary.properties

Modified:
    geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/Controller.groovy

Modified: geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/Controller.groovy
URL: http://svn.apache.org/viewvc/geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/Controller.groovy?view=diff&rev=502270&r1=502269&r2=502270
==============================================================================
--- geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/Controller.groovy
(original)
+++ geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/Controller.groovy
Thu Feb  1 08:36:44 2007
@@ -232,51 +232,43 @@
         def sourceDir = new File('project/tck-testsuite/target').canonicalFile
         log.info "Source dir: $sourceDir"
         
-        def targetDir = new File("reports/tck/$workflowId/$iteration").canonicalFile
+        def targetDir = new File("reports/tck/$workflowId").canonicalFile
         log.info "Target dir: $targetDir"
         
         separator()
         
-        // Copy test output to be saved/remoted
         ant.mkdir(dir: targetDir)
-        ant.copy(todir: targetDir, verbose: true) {
-            fileset(dir: sourceDir) {
+        
+        ant.zip(destfile: "$targetDir/runtests-results-${iteration}.zip") {
+            zipfileset(dir: "$sourceDir") {
                 include(name: 'logs/**')
-                include(name: 'summary.properties')
             }
-        }
-        
-        // Include the javatest workdir output
-        ant.mkdir(dir: "$targetDir/work")
-        ant.copy(todir: "$targetDir/work", verbose: true) {
-            fileset(dir: "$sourceDir/tck-work/$webcontainer") {
+            zipfileset(dir: "$sourceDir/tck-work/$webcontainer", prefix: 'javatest') {
                 include(name: '**')
             }
         }
         
+        
         //
-        // HACK: Make a zip and put it under the workflowId, will remove others
-        //       shortly, but currently need it for compat until new reporting is done
+        // HACK: Copy the summary.properties, since we need that for legacy report generation
         //
         
-        ant.zip(destfile: "reports/tck/$workflowId/runtests-results-${iteration}.zip") {
-            zipfileset(dir: targetDir, includes: '**')
-        }
+        ant.copy(file: "$sourceDir/summary.properties",
+                 tofile: "$targetDir/summary-${iteration}.properties",
+                 verbose: true)
         
         separator()
     }
     
     def generateReport = {
-        def workflowId = params.require('anthill.workflow.id')
-        def webcontainer = params.require('webcontainer')
-        
-        //
-        // TODO: Do away with the sections.properties file as well as the report generation
from Maven,
-        //       generate the entire report here in Groovy
         //
-        //       Will need to include velocity:velocity in the harness lib/
+        // NOTE: This is the legacy report based on summary.properties, which
+        //       will soon be replaced
         //
         
+        def workflowId = params.require('anthill.workflow.id')
+        def webcontainer = params.require('webcontainer')
+        
         def sections = new File('project/tck-testsuite/sections.properties').canonicalFile
         log.info "Using sections from: $sections"
         
@@ -288,45 +280,17 @@
         log.info "Generating reports into: $reportDir"
         ant.mkdir(dir: reportDir)
         
-        // Copy all summary properties to a tempdir for soaking up
-        def summariesDir = new File('temp/summaries').canonicalFile
-        ant.mkdir(dir: summariesDir)
-        
-        def scanner = ant.fileScanner {
-            fileset(dir: inputDir) {
-                include(name: '*/summary.properties')
-            }
-        }
-        for (file in scanner) {
-             def uuid = UUID.randomUUID()
-             ant.copy(file: file, tofile: "$summariesDir/${uuid}.properties", verbose: true)
-        }
-        
         // Invoke maven to generate the report
         def maven = new MavenCommand(context)
         maven.pom = 'project/tck-testsuite/pom.xml'
         maven.offline = true
         
-        //
-        // TODO: Need to include some detail about the webcontainer that we tested,
-        //       really would like to have some details about the exact CTS bin which was
used
-        //
-        
         def args = []
         args << 'j2eetck:generate-report'
         args << "-DsectionsFile=$sections"
-        args << "-DsummariesDirectory=$summariesDir"
+        args << "-DsummariesDirectory=$inputDir"
         args << "-DreportsDirectory=ignored"
         args << "-DoutputDirectory=$reportDir"
-        
-        //
-        // NOTE: We really want to have easy links to the javatest/server logs from the html
report
-        //       which generally means copying them into reportDir (duplicated them from
artifacts)
-        //
-        
-        //
-        // TODO: Generate summary of iterations, with links to logs in addition to a test
summary
-        //
         
         maven.execute(args)
     }



Mime
View raw message