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

[ja...@apache.org]

Author: jawarner
Date: Wed Apr 28 20:18:52 2010
New Revision: 939075

URL: http://svn.apache.org/viewvc?rev=939075&view=rev
Log:
Update generateReport method and remove unnecesssary code from collectResults

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?rev=939075&r1=939074&r2=939075&view=diff
==============================================================================
--- 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 Wed Apr 28 20:18:52 2010
@@ -321,36 +321,7 @@ class Controller extends gbuild.system.P
     def collectResults = {
 
         def tests = params.require('tests')
-        def webcontainer = params.require('webcontainer')
-        
-        
-        // HACK:  The current iteration of the automation doesn't use the harness
-        //        to actually run the tests, so no runtests.properties file is create.
-        //        Create a basic file using information passed from AHP and elsewhere
-        //        so reporting works
-        
-        
-        // HACK:  We'd like to have the geronimo server and cts revisions displayed
-        //        on the reports page.  They have been stored in some txt files in
-        //        the repository.  We need to retrieve them and store them as properties
-        //        in the runtests.properties file.
-        
-        // Note:  We're not actually doing this right now.
-        // def serverRevisionFile = new File('repository/serverRevision.txt').canonicalFile
-        // def serverLines = serverRevisionFile.readLines()
-        
-        // def ctsRevisionFile = new File('repository/ctsRevision.txt').canonicalFile
-        // def iteration = params.require('iteration')
-        
-        // def cfg = new IterationConfigurator()
-        // cfg.configFile = 'tck-testsuite/iterations.xml'
-        // cfg.iteration = iteration
-        // cfg.applyTo = [ 'tests' ]
-        // cfg.apply(params)
-        
-        // def propDir = new File('target').canonicalFile
-        // propDir.mkdirs()
-        // params.store("$propDir/runtests.properties")  
+        def webcontainer = params.require('webcontainer')  
         
         def sourceDir = new File('project/tck-testsuite/target').canonicalFile
         
@@ -391,9 +362,7 @@ class Controller extends gbuild.system.P
     }
     
     def generateReport = {
-        def workflowId = params.require('anthill.workflow.id')
-        
-        def sourceDir = new File("target/results/$workflowId").canonicalFile
+        def sourceDir = new File("target/results").canonicalFile
         log.info "Source dir: $sourceDir"
         assert sourceDir.exists() : sourceDir
         
@@ -403,7 +372,8 @@ class Controller extends gbuild.system.P
         // Find all of the result archives
         def files = ant.fileScanner {
             fileset(dir: sourceDir) {
-                include(name: 'runtests-results-*.zip')
+                include(name: 'tomcat/runtests-results-*.zip')
+                include(name: 'jetty/runtests-results-*.zip')
             }
         }