[Swift-commit] r3305 - SwiftApps/adem-osg

[noreply at svn.ci.uchicago.edu]

Author: aespinosa
Date: 2010-05-03 14:56:16 -0500 (Mon, 03 May 2010)
New Revision: 3305

Modified:
   SwiftApps/adem-osg/adem-test.rb
   SwiftApps/adem-osg/adem.rb
Log:
Changed script upload into a gridftp session

Modified: SwiftApps/adem-osg/adem-test.rb
===================================================================
--- SwiftApps/adem-osg/adem-test.rb	2010-05-03 19:56:14 UTC (rev 3304)
+++ SwiftApps/adem-osg/adem-test.rb	2010-05-03 19:56:16 UTC (rev 3305)
@@ -64,7 +64,8 @@
     # Firefly
     site = {
       :compute_element => "ff-grid.unl.edu:2119/jobmanager-pbs",
-      :app_directory => "/panfs/panasas/CMS/app"
+      :app_directory => "/panfs/panasas/CMS/app",
+      :storage_element => "gsiftp://ff-gridftp.unl.edu:2811"
     }
     assert_equal("/opt/pacman/pacman-3.28", pacman_find(site, @conf))
   end

Modified: SwiftApps/adem-osg/adem.rb
===================================================================
--- SwiftApps/adem-osg/adem.rb	2010-05-03 19:56:14 UTC (rev 3304)
+++ SwiftApps/adem-osg/adem.rb	2010-05-03 19:56:16 UTC (rev 3305)
@@ -126,6 +126,7 @@
 
 def pacman_find(site, conf)
   contact = site_fork site[:compute_element]
+  storage = site[:storage_element].first
   rootdir = site[:app_directory] + "/" + conf[:virtual_organization] 
   script = <<-eos
 #!/bin/bash
@@ -134,8 +135,7 @@
   File.open("/tmp/find_pacman.sh", "w") do |dump|
     dump << script
   end
-  `globus-job-run #{contact} /bin/mkdir -p #{rootdir}`
-  `globus-job-run #{contact} -d #{rootdir} -stdin -s /tmp/find_pacman.sh /bin/bash -c 'cat > find_pacman.sh'`
+  `globus-url-copy -cd file:///tmp/find_pacman.sh #{storage}#{rootdir}/find_pacman.sh`
   `globus-job-run #{contact} -d #{rootdir} /bin/chmod 755 find_pacman.sh`
   File.dirname(File.dirname(`globus-job-run #{contact} -d #{rootdir} find_pacman.sh`))
 end