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

[noreply at svn.ci.uchicago.edu]

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

Modified:
   SwiftApps/adem-osg/adem-test.rb
   SwiftApps/adem-osg/adem.rb
Log:
changed to literal contact string

Modified: SwiftApps/adem-osg/adem-test.rb
===================================================================
--- SwiftApps/adem-osg/adem-test.rb	2010-05-03 19:56:21 UTC (rev 3307)
+++ SwiftApps/adem-osg/adem-test.rb	2010-05-03 19:56:23 UTC (rev 3308)
@@ -69,7 +69,10 @@
     }
     assert_equal(
       "/opt/pacman/pacman-3.28",
-      pacman_find(site, "/panfs/panasas/CMS/app/engage")
+      pacman_find(
+        "ff-grid.unl.edu/jobmanager-fork",
+        "/panfs/panasas/CMS/app/engage"
+      )
     )
   end
 end

Modified: SwiftApps/adem-osg/adem.rb
===================================================================
--- SwiftApps/adem-osg/adem.rb	2010-05-03 19:56:21 UTC (rev 3307)
+++ SwiftApps/adem-osg/adem.rb	2010-05-03 19:56:23 UTC (rev 3308)
@@ -115,8 +115,9 @@
 def app_deploy(app, conf)
   conf[:sites].each do |site|
     path = "#{site[:app_directory]}/#{conf[:virtual_organization]}"
-    site[:pacman] = pacman_find(site, path) if not site[:pacman] 
-    pacman_install site, path
+    contact = site_fork site[:compute_element]
+    site[:pacman] = pacman_find(contact, path) if not site[:pacman] 
+    pacman_install contact, path
   end
 end
 
@@ -124,8 +125,7 @@
   compute_element.gsub /jobmanager-.*$/, "jobmanager-fork"
 end
 
-def pacman_find(site, rootdir)
-  contact = site_fork site[:compute_element]
+def pacman_find(contact, rootdir)
   File.open("find_pacman.sh", "w") do |dump|
     dump.puts "#!/bin/bash"
     dump.puts "which pacman"