[Collab-qa-commits] r1199 - debcluster/scripts

[lucas at alioth.debian.org]

Author: lucas
Date: 2008-09-02 10:42:19 +0000 (Tue, 02 Sep 2008)
New Revision: 1199

Modified:
   debcluster/scripts/masternode.rb
Log:
debcluster path updates

Modified: debcluster/scripts/masternode.rb
===================================================================
--- debcluster/scripts/masternode.rb	2008-09-02 10:42:04 UTC (rev 1198)
+++ debcluster/scripts/masternode.rb	2008-09-02 10:42:19 UTC (rev 1199)
@@ -142,14 +142,14 @@
   else
     bridge=""
   end
-  system("scp #{SSHOPTS} /debcluster-scripts/scripts/bin/dc-mountnfs #{n}:/root/dc-mountnfs")
+  system("scp #{SSHOPTS} /dc/debcluster/scripts/bin/dc-mountnfs #{n}:/root/dc-mountnfs")
   system("ssh #{SSHOPTS} #{n} \"/root/dc-mountnfs #{bridge}\" &> /root/mountnfs.log.#{n}") 
   if $virt
     virt="-v -m #{vn.join(' -m ')} -n #{ns} -g #{gw}"
   else
     virt=""
   end
-  ret = system("ssh #{SSHOPTS} #{n} \"/debcluster-scripts/scripts/tasks/preparenode.rb --log /debcluster-data/logs/preparenode/#{n}.$(date --iso) #{virt}\"")
+  ret = system("ssh #{SSHOPTS} #{n} \"/dc/debcluster/scripts/tasks/preparenode.rb --log /dc/data/logs/preparenode/#{n}.$(date --iso) #{virt}\"")
   if not ret
     puts "E:preparenode.rb failed on #{n}."
     return false
@@ -228,7 +228,7 @@
         if i[1] == :free
           puts "  #{i[0]}: Free"
         else
-          puts "  #{i[0]}: #{i[1]} since #{Time::now - i[1].starttime}"
+          puts "  #{i[0]}: #{i[1]} since #{(Time::now - i[1].starttime).to_i}"
         end
       end
       STDOUT.flush
@@ -239,7 +239,7 @@
 def testnode(node, tries)
   try = 0
   while try < tries
-    s = `ssh #{SSHOPTS} #{node} "(cd /debcluster-scripts/scripts/ && hostname) 2>&1"`
+    s = `ssh #{SSHOPTS} #{node} "(cd /dc/debcluster/scripts/ && hostname) 2>&1"`
     if s.chomp != node and not ($virt and s.chomp == 'debian')
       puts "testnode() failed on #{node}:"
       p s.chomp
@@ -402,7 +402,7 @@
 
 # setup SSH so we can connect to the other nodes
 system("mkdir ~/.ssh &>/dev/null")
-system("cp /debcluster-data/ssh/* ~/.ssh/")
+system("cp /dc/data/ssh/* ~/.ssh/")
 
 # read and start nodes
 nodes = IO::read(nodesfile).split(/\n/).map { |l| l.chomp }
@@ -434,7 +434,7 @@
 end
 
 # Preparation of master node + chroots
-ret = system("/debcluster-scripts/scripts/tasks/preparenode.rb --log /debcluster-data/logs/preparenode/MASTER-#{$masternode}.$(date --iso)")
+ret = system("/dc/debcluster/scripts/tasks/preparenode.rb --log /dc/data/logs/preparenode/MASTER-#{$masternode}.$(date --iso)")
 if not ret
   puts "preparenode.rb FAILED on masternode. exiting."
   exit(1)
@@ -450,7 +450,7 @@
   end
 end
 if $update.length > 0
-  ret = system("/debcluster-scripts/scripts/tasks/updateschroots.rb #{$update.join(' ')}")
+  ret = system("/dc/debcluster/scripts/tasks/updateschroots.rb #{$update.join(' ')}")
   if not ret
     puts "Update of #{$update.join(' ')} FAILED. exiting."
     exit(1)