geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jawar...@apache.org
Subject svn commit: r939054 - /geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/Controller.groovy
Date Wed, 28 Apr 2010 19:14:40 GMT
Author: jawarner
Date: Wed Apr 28 19:14:40 2010
New Revision: 939054

URL: http://svn.apache.org/viewvc?rev=939054&view=rev
Log:
Start making modifications to the collectResults method to work with our current test structure

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=939054&r1=939053&r2=939054&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 19:14:40 2010
@@ -319,8 +319,9 @@ class Controller extends gbuild.system.P
     }
     
     def collectResults = {
-        def workflowId = params.require('anthill.workflow.id')
-        def test = params.require('test')
+
+        def tests = params.require('tests')
+        def webcontainer = params.require('webcontainer')
         
         
         // HACK:  The current iteration of the automation doesn't use the harness
@@ -334,30 +335,28 @@ class Controller extends gbuild.system.P
         //        the repository.  We need to retrieve them and store them as properties
         //        in the runtests.properties file.
         
-        def serverRevisionFile = new File('repository/serverRevision.txt').canonicalFile
-        def serverLines = serverRevisionFile.readLines()
-        
-        def ctsRevisionFile = new File('repository/ctsRevision.txt').canonicalFile
-        
-        
-        def webcontainer = params.require('webcontainer')
-        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")  
+        // 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 sourceDir = new File('tck-testsuite/target').canonicalFile
         
         log.info "Source dir: $sourceDir"
         
-        def targetDir = new File("target/results/$workflowId").canonicalFile
+        def targetDir = new File("target/results/$webcontainer").canonicalFile
         log.info "Target dir: $targetDir"
         
         separator()
@@ -368,7 +367,7 @@ class Controller extends gbuild.system.P
         // FIXME: Need to handle logs for retries....
         //
         
-        ant.zip(destfile: "$targetDir/runtests-results-${test}.zip") {
+        ant.zip(destfile: "$targetDir/runtests-results-${tests}-${webcontainer}.zip") {
             zipfileset(dir: 'target') {
                 include(name: 'runtests.properties')
                 include(name: 'ts.jte')



Mime
View raw message