[Collab-qa-commits] r1845 - in debcluster/scripts: . bin.local

[Lucas Nussbaum]

Author: lucas
Date: 2010-11-21 09:03:55 +0000 (Sun, 21 Nov 2010)
New Revision: 1845

Added:
   debcluster/scripts/childof
Modified:
   debcluster/scripts/bin.local/instest-squeeze-amd64.sh
   debcluster/scripts/bin.local/rebuild-squeeze-main-squeeze64.sh
   debcluster/scripts/bin.local/rebuild-ubuntu.sh
   debcluster/scripts/update-mirror-ubuntu.bash
Log:
various minor updates

Modified: debcluster/scripts/bin.local/instest-squeeze-amd64.sh
===================================================================
--- debcluster/scripts/bin.local/instest-squeeze-amd64.sh	2010-11-21 09:03:18 UTC (rev 1844)
+++ debcluster/scripts/bin.local/instest-squeeze-amd64.sh	2010-11-21 09:03:55 UTC (rev 1845)
@@ -7,7 +7,7 @@
 
 ARCH=amd64
 ID=squeeze64-amd64.$(date --iso)
-SUBNODES=5
+SUBNODES=20
 JOBTYPE=3
 #LIST=~/failed
 #LISTOK=~/inst_ok
@@ -23,6 +23,8 @@
 if [ "$LISTOK" != "" ];then
   fcb -l /tmp/wp.$ID.1 minus $LISTOK > /tmp/wp.$ID.2
 fi
+tac /tmp/wp.$ID.2 > /tmp/wp.$ID.2.1
+mv /tmp/wp.$ID.2.1 /tmp/wp.$ID.2
 #fcb /tmp/wp.${ID}.1 minus piuparts/piuparts.untestable > /tmp/wp.${ID}.2
 for p in $(</tmp/wp.${ID}.2); do
   echo "it_${ID}_${p} [0,-1] /dc/debcluster/scripts/tasks/instest.rb -p $p -c lsqueeze64-instest -l /dc/data/logs/inst.${ID}/${p}.log --upgrade-chroot llenny64-instest"
@@ -36,4 +38,4 @@
 
 ENV=lenny-x64-base
 ENV=squeeze-minimal
-ssh $TARGET "oarsub -t deploy $OAROPTS -l nodes=${NODES},walltime=${WALLTIME} \"/home/lnussbaum/bin/katapult3 --deploy-env ${ENV} --copy-ssh-key -- /home/lnussbaum/bin/dc-startcluster ${TL} --update squeeze64-instest-source --update lenny64-instest-source --type $JOBTYPE --subnodes ${SUBNODES} --mirror\""
+ssh $TARGET "oarsub -q testing -t deploy $OAROPTS -l nodes=${NODES},walltime=${WALLTIME} \"/home/lnussbaum/bin/katapult3 --deploy-env ${ENV} --copy-ssh-key -- /home/lnussbaum/bin/dc-startcluster ${TL} --type $JOBTYPE --subnodes ${SUBNODES} --mirror\""

Modified: debcluster/scripts/bin.local/rebuild-squeeze-main-squeeze64.sh
===================================================================
--- debcluster/scripts/bin.local/rebuild-squeeze-main-squeeze64.sh	2010-11-21 09:03:18 UTC (rev 1844)
+++ debcluster/scripts/bin.local/rebuild-squeeze-main-squeeze64.sh	2010-11-21 09:03:55 UTC (rev 1845)
@@ -5,7 +5,7 @@
 ARCH=amd64
 CHROOT=lsqueeze64
 ID=${CHROOT}-${ARCH}.$(date --iso)
-SUBNODES=4
+SUBNODES=8
 JOBTYPE=3
 #LIST=~/failed
 WALL=wall

Modified: debcluster/scripts/bin.local/rebuild-ubuntu.sh
===================================================================
--- debcluster/scripts/bin.local/rebuild-ubuntu.sh	2010-11-21 09:03:18 UTC (rev 1844)
+++ debcluster/scripts/bin.local/rebuild-ubuntu.sh	2010-11-21 09:03:55 UTC (rev 1845)
@@ -53,6 +53,7 @@
 scp /tmp/tl.$ID $TARGET:
 
 ENV=lenny-x64-base
+ENV=squeeze-minimal
 echo "oarsub at $TARGET ..."
 ssh $TARGET "oarsub -t deploy $OAROPTS -l nodes=${NODES},walltime=${WALLTIME} \"/home/lnussbaum/bin/katapult3 --deploy-env ${ENV} --copy-ssh-key -- /home/lnussbaum/bin/dc-startcluster ${TL} --update ubuntu64-source --update ubuntu32-source --type $JOBTYPE --subnodes ${SUBNODES} --mirror\""
 

Added: debcluster/scripts/childof
===================================================================
--- debcluster/scripts/childof	                        (rev 0)
+++ debcluster/scripts/childof	2010-11-21 09:03:55 UTC (rev 1845)
@@ -0,0 +1,25 @@
+#!/usr/bin/ruby -w
+
+require 'pp'
+$children = {}
+`ps h -e -o pid,ppid`.each_line do |l|
+  pid, ppid = l.split(/\s+/)
+  $children[ppid] = [] if $children[ppid].nil?
+  $children[ppid] << pid
+end
+def getchild(pid)
+#  puts "called with #{pid}"
+  r = []
+  r += ($children[pid] or [])
+  r.each do |pid2|
+    r += getchild(pid2)
+  end
+  r += [ pid ]
+  r
+end
+
+o = []
+ARGV.each do |pid|
+  o += getchild(pid)
+end
+puts o.sort.uniq.join(' ')


Property changes on: debcluster/scripts/childof
___________________________________________________________________
Added: svn:executable
   + *

Modified: debcluster/scripts/update-mirror-ubuntu.bash
===================================================================
--- debcluster/scripts/update-mirror-ubuntu.bash	2010-11-21 09:03:18 UTC (rev 1844)
+++ debcluster/scripts/update-mirror-ubuntu.bash	2010-11-21 09:03:55 UTC (rev 1845)
@@ -2,7 +2,7 @@
 
 LPORT=12001
 ROOT=ubuntu
-DIST=lucid,maverick
+DIST=lucid,maverick,natty
 SECT=main,restricted,universe,multiverse
 ARCH=amd64,i386
 TARGET=/home/lnussbaum/mirrors/ubuntu