diff options
author | Christoph Helma <helma@in-silico.ch> | 2011-03-11 14:29:13 +0100 |
---|---|---|
committer | Christoph Helma <helma@in-silico.ch> | 2011-03-11 14:29:13 +0100 |
commit | 96d500e9691eedbfdd57ec35a2572b59641377f3 (patch) | |
tree | 211391f36e269bf36ca09d54aab0d93ababfa412 /nightly/nightly.rb | |
parent | 5f243f1e9e0a8e12cd8a2267bcec3140d21bf445 (diff) | |
parent | 7cd9c9656010b88b7e41477e1571cb7e722650c4 (diff) |
Merge branch 'release/v1.0.1'v1.0.1
Diffstat (limited to 'nightly/nightly.rb')
-rwxr-xr-x[-rw-r--r--] | nightly/nightly.rb | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/nightly/nightly.rb b/nightly/nightly.rb index f402691..07cd11a 100644..100755 --- a/nightly/nightly.rb +++ b/nightly/nightly.rb @@ -21,7 +21,7 @@ class Nightly validationExamples = ValidationExamples.select(select) return "please \"select\" validation examples:\n"+ValidationExamples.list if validationExamples.size==0 - task_uri = OpenTox::Task.as_task() do + task = OpenTox::Task.create("Build nightly","nightly-validation-test-service") do |task| #,{:select => select, :dry_run => dry_run}) LOGGER.info("Building nightly report") benchmarks = validationExamples.collect{ |e| ValidationBenchmark.new(e) } @@ -35,7 +35,7 @@ class Nightly running << id Thread.new do begin - b.build + b.build() rescue => ex LOGGER.error "uncaught nightly build error: "+ex.message ensure @@ -98,13 +98,9 @@ class Nightly end #benchmarks.collect{|b| b.uris}.join(",") - File.join(@@config[:services]["opentox-validation"],"nightly") - end - if defined?(halt) - halt 202,task_uri - else - return task_uri + File.join(CONFIG[:services]["opentox-validation"],"nightly") end + return_task(task) end class ValidationBenchmark @@ -219,4 +215,4 @@ class Nightly end end -end
\ No newline at end of file +end |