[Collab-qa-commits] r675 - in debcluster: configs/schroot misc scripts scripts/bin scripts/tasks
lucas at alioth.debian.org
lucas at alioth.debian.org
Fri Jan 25 21:48:06 UTC 2008
Author: lucas
Date: 2008-01-25 21:48:06 +0000 (Fri, 25 Jan 2008)
New Revision: 675
Added:
debcluster/misc/compare-results.bash
debcluster/misc/filter-debdiff.bash
debcluster/scripts/update-mirror-ubuntu-toolchain.bash
Modified:
debcluster/configs/schroot/schroot.conf
debcluster/scripts/bin/dc-mountnfs
debcluster/scripts/masternode.rb
debcluster/scripts/tasks/preparenode.rb
Log:
sync of debcluster stuff
Modified: debcluster/configs/schroot/schroot.conf
===================================================================
--- debcluster/configs/schroot/schroot.conf 2008-01-25 11:41:47 UTC (rev 674)
+++ debcluster/configs/schroot/schroot.conf 2008-01-25 21:48:06 UTC (rev 675)
@@ -168,6 +168,24 @@
run-setup-scripts=true
root-users=user
+[hardy32-g43]
+type=file
+description=Debian sid 32 bits
+file=/debcluster-data/chroots/hardy32-g43.tgz
+priority=2
+run-setup-scripts=true
+personality=linux32
+root-users=user
+
+[hardy32]
+type=file
+description=Debian sid 32 bits
+file=/debcluster-data/chroots/hardy32.tgz
+priority=2
+run-setup-scripts=true
+personality=linux32
+root-users=user
+
[gutsy32]
type=file
description=Debian sid 32 bits
Added: debcluster/misc/compare-results.bash
===================================================================
--- debcluster/misc/compare-results.bash (rev 0)
+++ debcluster/misc/compare-results.bash 2008-01-25 21:48:06 UTC (rev 675)
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+for d in $(cd bdfh ; echo */*); do
+ mkdir -p debdiff/$d
+ pkg=$(basename $d)
+ echo $pkg
+ debdiff normal/${d}/*changes bdfh/${d}/*changes &> debdiff/${d}/${pkg}.debdiff
+done
Added: debcluster/misc/filter-debdiff.bash
===================================================================
--- debcluster/misc/filter-debdiff.bash (rev 0)
+++ debcluster/misc/filter-debdiff.bash 2008-01-25 21:48:06 UTC (rev 675)
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+ddiff=$1
+md5=$(md5sum < $ddiff)
+if [ "$md5" == "11a126c02dd7dae0bbd80cf5dd8969ab -" ]; then
+ rm $ddiff
+ exit 0
+fi
+
+t=$(mktemp)
+
+grep -v -e "^File lists identical (after any substitutions)" -e "^No differences were encountered between the control files of package" -e '^$' < $ddiff > $t
+if [ $(wc -l < $t) -eq 0 ]; then
+ rm $ddiff
+ exit 0
+fi
+
+if grep -q "debdiff: fatal error at line 260:" $ddiff; then
+ rm $ddiff
+ exit 0
+fi
+
+
Property changes on: debcluster/misc/filter-debdiff.bash
___________________________________________________________________
Name: svn:executable
+ *
Modified: debcluster/scripts/bin/dc-mountnfs
===================================================================
--- debcluster/scripts/bin/dc-mountnfs 2008-01-25 11:41:47 UTC (rev 674)
+++ debcluster/scripts/bin/dc-mountnfs 2008-01-25 21:48:06 UTC (rev 675)
@@ -16,11 +16,15 @@
# setup bridge if neeeded
if [ "$1" = "bridge" ];then
apt-get -y install bridge-utils
+ echo "ifconfig | grep eth::"
+ ifconfig | grep eth
+ ETH=$(ifconfig | grep "^eth" | head -1 | awk '{print $1}')
+ echo "Using $ETH"
if ! grep -q br0 /etc/network/interfaces; then
cat <<EOF >> /etc/network/interfaces
iface br0 inet dhcp
- bridge_ports eth0
+ bridge_ports $ETH
bridge_maxwait 0
bridge_stp off
bridge_fd 1
@@ -37,11 +41,11 @@
EOF
echo "###################"
- ifdown eth0
+ ifdown $ETH
echo "###################"
sleep 1
echo "###################"
- ifconfig eth0 0.0.0.0 promisc up
+ ifconfig $ETH 0.0.0.0 promisc up
echo "###################"
sleep 1
echo "###################"
Modified: debcluster/scripts/masternode.rb
===================================================================
--- debcluster/scripts/masternode.rb 2008-01-25 11:41:47 UTC (rev 674)
+++ debcluster/scripts/masternode.rb 2008-01-25 21:48:06 UTC (rev 675)
@@ -246,7 +246,7 @@
ok = true
while ok
s = `ssh #{SSHOPTS} #{node} "(cd /debcluster-scripts/scripts/ && hostname) 2>&1"`
- if s.chomp != node
+ if s.chomp != node and not ($virt and s.chomp == 'debian')
p s.chomp
p node
ok = false
@@ -300,13 +300,15 @@
cluster = $1
vn = []
if $virt
- if $first_addr[cluster].nil?
- $first_addr[cluster] = IPAddr::new(NET_ADDR[cluster])
- end
- (1..nbsubnodes).each do |i|
+ $mutex.synchronize do
+ if $first_addr[cluster].nil?
+ $first_addr[cluster] = IPAddr::new(NET_ADDR[cluster])
+ end
+ (1..nbsubnodes).each do |i|
- vn << $first_addr[cluster]
- $first_addr[cluster] = $first_addr[cluster].next
+ vn << $first_addr[cluster]
+ $first_addr[cluster] = $first_addr[cluster].next
+ end
end
end
return if not preparenode(nodehost, vn, NET_NS, NET_GW[cluster])
@@ -384,7 +386,7 @@
# Tasks
if File::exists?(tasksfile)
begin
- tasks = Marshal::load(IO::read(ARGV[1]))
+ tasks = Marshal::load(IO::read(tasksfile))
rescue
puts "Something really wrong happend while reading tasks list, setting interactive mode."
$interactive = true
Modified: debcluster/scripts/tasks/preparenode.rb
===================================================================
--- debcluster/scripts/tasks/preparenode.rb 2008-01-25 11:41:47 UTC (rev 674)
+++ debcluster/scripts/tasks/preparenode.rb 2008-01-25 21:48:06 UTC (rev 675)
@@ -56,10 +56,13 @@
ENV['DEBIAN_FRONTEND'] = 'noninteractive'
system("apt-get update")
+# upgrade dpkg separately to etch version.
+system("dpkg -i /debcluster-data/pkgs/dpkg_1.14.15_amd64.deb")
# basic packages
-system("apt-get install -y pbuilder nullmailer sbuild schroot debootstrap fakeroot piuparts python nfs-common initscripts sysvinit-utils apache2 linux32 sbuild")
-system("dpkg -i /debcluster-data/piuparts/piuparts*deb")
+system("apt-get install -y pbuilder nullmailer sbuild schroot debootstrap fakeroot piuparts python nfs-common initscripts sysvinit-utils apache2 linux32 sbuild lvm2")
+#system("dpkg -i /debcluster-data/piuparts/piuparts*deb")
system("apt-get -f install")
+system("apt-get -f install")
# configure apache2 as proxy
system("cp /debcluster-scripts/configs/{disk_cache.conf,mem_cache.conf,proxy.conf} /etc/apache2/mods-available/")
@@ -112,9 +115,11 @@
system("cp /debcluster-data/qemu/{initrd.gz,vmlinux-2.6.18-5-qemu} /debscratch")
vn.each do |v|
puts "Starting #{v} ..."
+ mac = v.split(/\./).map { |e| e.to_i.to_s(16) }.join(':')
+ mac = '52:54:' + mac
f=`mktemp /tmp/screencmd.XXXXXX`.chomp
fd = File::new(f, 'w')
- fd.puts("/usr/local/bin/qemu-system-mips -kernel vmlinux-2.6.18-5-qemu -initrd initrd.gz -hda hda-mips.qcow2 -append \"root=/dev/hda1 console=ttyS0 ip=#{v} mask=255.252.0.0 ns=#{ns} gw=#{gw}\" -nographic -net nic -net tap,script=/debcluster-scripts/configs/qemu-ifup -m 256 -snapshot")
+ fd.puts("/usr/local/bin/qemu-system-mips -kernel vmlinux-2.6.18-5-qemu -initrd initrd.gz -hda hda-mips.qcow2 -append \"root=/dev/hda1 console=ttyS0 ip=#{v} mask=255.252.0.0 ns=#{ns} gw=#{gw}\" -nographic -net nic,macaddr=#{mac} -net tap,script=/debcluster-scripts/configs/qemu-ifup -m 256 -snapshot")
fd.close
system("chmod a+x #{f}")
system("cd /debscratch && screen -d -m \"#{f}\"")
Added: debcluster/scripts/update-mirror-ubuntu-toolchain.bash
===================================================================
--- debcluster/scripts/update-mirror-ubuntu-toolchain.bash (rev 0)
+++ debcluster/scripts/update-mirror-ubuntu-toolchain.bash 2008-01-25 21:48:06 UTC (rev 675)
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+TARGET=/home/grenoble/lnussbaum/debcluster-data/mirrors/ubuntu-toolchain
+mkdir -p $TARGET
+cd $TARGET
+wget -r -np -nH -nc --cut-dirs=2 http://ppa.launchpad.net/ubuntu-toolchain/ubuntu/
+
Property changes on: debcluster/scripts/update-mirror-ubuntu-toolchain.bash
___________________________________________________________________
Name: svn:executable
+ *
More information about the Collab-qa-commits
mailing list