[Collab-qa-commits] r1197 - in debcluster: configs configs/schroot scripts/tasks

lucas at alioth.debian.org lucas at alioth.debian.org
Tue Sep 2 09:04:39 UTC 2008 

Author: lucas
Date: 2008-09-02 09:04:38 +0000 (Tue, 02 Sep 2008)
New Revision: 1197

Modified:
   debcluster/configs/approx.conf
   debcluster/configs/iptables.rules
   debcluster/configs/schroot/schroot.conf
   debcluster/scripts/tasks/buildpackage.rb
   debcluster/scripts/tasks/preparenode.rb
Log:
debcluster cleanup

Modified: debcluster/configs/approx.conf
===================================================================
--- debcluster/configs/approx.conf	2008-09-02 09:04:23 UTC (rev 1196)
+++ debcluster/configs/approx.conf	2008-09-02 09:04:38 UTC (rev 1197)
@@ -1,8 +1,8 @@
 # Here are some examples of remote repository mappings.
 # See http://www.debian.org/mirror/list for mirror sites.
 
-debian		http://idpot.grenoble.grid5000.fr/mirrors/debian
-ubuntu		http://idpot.grenoble.grid5000.fr/mirrors/ubuntu
+debian		http://beaujolais.grenoble.grid5000.fr/mirrors/debian
+ubuntu		http://beaujolais.grenoble.grid5000.fr/mirrors/ubuntu
 #security	http://security.debian.org/debian-security
 #volatile	http://volatile.debian.org/debian-volatile
 

Modified: debcluster/configs/iptables.rules
===================================================================
--- debcluster/configs/iptables.rules	2008-09-02 09:04:23 UTC (rev 1196)
+++ debcluster/configs/iptables.rules	2008-09-02 09:04:38 UTC (rev 1197)
@@ -8,8 +8,8 @@
 -A LD -j REJECT
 # to localhost
 -A OUTPUT -o lo -j ACCEPT
-# to IDPOT
--A OUTPUT -d 129.88.70.59/255.255.255.192 -j ACCEPT
+# to GRENOBLE
+-A OUTPUT -d 129.88.0.0/255.255.0.0 -j ACCEPT
 # to clusters
 # virt
 -A OUTPUT -d 10.0.0.0/255.0.0.0 -j ACCEPT

Modified: debcluster/configs/schroot/schroot.conf
===================================================================
--- debcluster/configs/schroot/schroot.conf	2008-09-02 09:04:23 UTC (rev 1196)
+++ debcluster/configs/schroot/schroot.conf	2008-09-02 09:04:38 UTC (rev 1197)
@@ -73,7 +73,7 @@
 [sid64]
 type=file
 description=Debian sid 64 bits
-file=/debcluster-data/chroots/sid64.tgz
+file=/dc/data/chroots/sid64.tgz
 priority=2
 run-setup-scripts=true
 root-users=user
@@ -81,7 +81,7 @@
 [sid32-dpkg]
 type=file
 description=Debian sid 32 bits
-file=/debcluster-data/chroots/sid32-dpkg.tgz
+file=/dc/data/chroots/sid32-dpkg.tgz
 priority=2
 run-setup-scripts=true
 personality=linux32
@@ -91,7 +91,7 @@
 [sid32-dash]
 type=file
 description=Debian sid 32 bits
-file=/debcluster-data/chroots/sid32-dash.tgz
+file=/dc/data/chroots/sid32-dash.tgz
 priority=2
 run-setup-scripts=true
 personality=linux32
@@ -100,7 +100,7 @@
 [sid32-im]
 type=file
 description=Debian sid 32 bits
-file=/debcluster-data/chroots/sid32-im.tgz
+file=/dc/data/chroots/sid32-im.tgz
 priority=2
 run-setup-scripts=true
 personality=linux32
@@ -109,7 +109,7 @@
 [sid32]
 type=file
 description=Debian sid 32 bits
-file=/debcluster-data/chroots/sid32.tgz
+file=/dc/data/chroots/sid32.tgz
 priority=2
 run-setup-scripts=true
 personality=linux32
@@ -129,7 +129,7 @@
 [lenny32-gcc]
 type=file
 description=Debian sid 32 bits
-file=/debcluster-data/chroots/lenny32-gcc.tgz
+file=/dc/data/chroots/lenny32-gcc.tgz
 priority=2
 run-setup-scripts=true
 personality=linux32
@@ -139,7 +139,7 @@
 [lenny32]
 type=file
 description=Debian sid 32 bits
-file=/debcluster-data/chroots/lenny32.tgz
+file=/dc/data/chroots/lenny32.tgz
 priority=2
 run-setup-scripts=true
 personality=linux32
@@ -157,7 +157,7 @@
 [etch32]
 type=file
 description=Debian sid 32 bits
-file=/debcluster-data/chroots/etch32.tgz
+file=/dc/data/chroots/etch32.tgz
 priority=2
 run-setup-scripts=true
 personality=linux32
@@ -166,7 +166,7 @@
 [etch32-piuparts]
 type=file
 description=Debian sid 32 bits
-file=/debcluster-data/chroots/etch32-piuparts.tgz
+file=/dc/data/chroots/etch32-piuparts.tgz
 priority=2
 run-setup-scripts=true
 personality=linux32
@@ -175,7 +175,7 @@
 [gutsy32-g43]
 type=file
 description=Debian sid 32 bits
-file=/debcluster-data/chroots/gutsy32-g43.tgz
+file=/dc/data/chroots/gutsy32-g43.tgz
 priority=2
 run-setup-scripts=true
 personality=linux32
@@ -184,7 +184,7 @@
 [gutsylp-g43]
 type=file
 description=Debian sid 32 bits
-file=/debcluster-data/chroots/gutsylp-g43.tgz
+file=/dc/data/chroots/gutsylp-g43.tgz
 priority=2
 run-setup-scripts=true
 personality=linux32
@@ -193,7 +193,7 @@
 [gutsy64-g43]
 type=file
 description=Debian sid 32 bits
-file=/debcluster-data/chroots/gutsy64-g43.tgz
+file=/dc/data/chroots/gutsy64-g43.tgz
 priority=2
 run-setup-scripts=true
 root-users=user
@@ -201,7 +201,7 @@
 [hardy32-g43]
 type=file
 description=Debian sid 32 bits
-file=/debcluster-data/chroots/hardy32-g43.tgz
+file=/dc/data/chroots/hardy32-g43.tgz
 priority=2
 run-setup-scripts=true
 personality=linux32
@@ -210,7 +210,7 @@
 [hardy32]
 type=file
 description=Debian sid 32 bits
-file=/debcluster-data/chroots/hardy32.tgz
+file=/dc/data/chroots/hardy32.tgz
 priority=2
 run-setup-scripts=true
 personality=linux32
@@ -219,7 +219,7 @@
 [gutsy32]
 type=file
 description=Debian sid 32 bits
-file=/debcluster-data/chroots/gutsy32.tgz
+file=/dc/data/chroots/gutsy32.tgz
 priority=2
 run-setup-scripts=true
 personality=linux32
@@ -228,7 +228,7 @@
 [gutsylp]
 type=file
 description=Debian sid 32 bits
-file=/debcluster-data/chroots/gutsylp.tgz
+file=/dc/data/chroots/gutsylp.tgz
 priority=2
 run-setup-scripts=true
 personality=linux32
@@ -237,7 +237,7 @@
 [gutsy64]
 type=file
 description=Debian sid 32 bits
-file=/debcluster-data/chroots/gutsy64.tgz
+file=/dc/data/chroots/gutsy64.tgz
 priority=2
 run-setup-scripts=true
 root-users=user
@@ -245,7 +245,7 @@
 [sid32-piuparts]
 type=file
 description=Debian sid 32 bits
-file=/debcluster-data/chroots/sid32-piuparts.tgz
+file=/dc/data/chroots/sid32-piuparts.tgz
 priority=2
 run-setup-scripts=true
 personality=linux32

Modified: debcluster/scripts/tasks/buildpackage.rb
===================================================================
--- debcluster/scripts/tasks/buildpackage.rb	2008-09-02 09:04:23 UTC (rev 1196)
+++ debcluster/scripts/tasks/buildpackage.rb	2008-09-02 09:04:38 UTC (rev 1197)
@@ -51,7 +51,7 @@
 
 # BDFH mode
 if bdfh
-  system("/debcluster-scripts/scripts/tasks/bdfh-prepare.bash")
+  system("/dc/debcluster/scripts/tasks/bdfh-prepare.bash")
   if $? != 0
     puts "BDFH preparation failed."
     exit(1)
@@ -64,7 +64,7 @@
   if not File::exists?("/debscratch/chroots/#{chr}.tgz")
     system("lockfile-create /debscratch/chroots/#{chr}.lock")
     if not File::exists?("/debscratch/chroots/#{chr}.tgz")
-      system("cp /debcluster-data/chroots/#{chr}.tgz /debscratch/chroots/#{chr}.tgz.#{$$}")
+      system("cp /dc/data/chroots/#{chr}.tgz /debscratch/chroots/#{chr}.tgz.#{$$}")
       system("mv /debscratch/chroots/#{chr}.tgz.#{$$} /debscratch/chroots/#{chr}.tgz")
     end
     system('lockfile-remove /debscratch/chroots/#{chr}.lock')
@@ -86,7 +86,7 @@
 puts "DC-Build-Header: #{package} #{version} / #{ts}"
 sbuild = "sbuild"
 if twice
-  sbuild = "/debcluster-scripts/configs/sbuild-twice"
+  sbuild = "/dc/debcluster/configs/sbuild-twice"
 end
 if root
   puts "unsupported"
@@ -99,7 +99,7 @@
     b = system("nice -n #{nice} su user -c '#{sbuild} -n -A -s --force-orig-source -d #{chroot} -v #{package}_#{version}'")
   end
 end
-#  | /debcluster-scripts/configs/ts -t
+#  | /dc/debcluster/configs/ts -t
 ret = $?
 realtime = Time::now - ts
 if b

Modified: debcluster/scripts/tasks/preparenode.rb
===================================================================
--- debcluster/scripts/tasks/preparenode.rb	2008-09-02 09:04:23 UTC (rev 1196)
+++ debcluster/scripts/tasks/preparenode.rb	2008-09-02 09:04:38 UTC (rev 1197)
@@ -48,17 +48,17 @@
 
 # SSH
 system("mkdir -p ~/.ssh &>/dev/null")
-system_r("cp /debcluster-data/ssh/* ~/.ssh/")
+system_r("cp /dc/data/ssh/* ~/.ssh/")
 
 # APT
 system_r("sed -i 's/.*http_proxy.*//' /etc/environment")
 ENV['http_proxy'] = ''
 File::open('/etc/apt/sources.list', 'w') do |f|
-  f.puts "deb http://idpot.grenoble.grid5000.fr/mirrors/debian etch main contrib non-free"
-  f.puts "deb http://idpot.grenoble.grid5000.fr/mirrors/debian lenny main contrib non-free"
-  f.puts "deb http://idpot.grenoble.grid5000.fr/mirrors/debian sid main contrib non-free"
-  f.puts "deb-src http://idpot.grenoble.grid5000.fr/mirrors/debian sid main contrib non-free"
-  f.puts "deb-src http://idpot.grenoble.grid5000.fr/mirrors/debian etch main contrib non-free"
+  f.puts "deb http://beaujolais.grenoble.grid5000.fr/mirrors/debian etch main contrib non-free"
+  f.puts "deb http://beaujolais.grenoble.grid5000.fr/mirrors/debian lenny main contrib non-free"
+  f.puts "deb http://beaujolais.grenoble.grid5000.fr/mirrors/debian sid main contrib non-free"
+  f.puts "deb-src http://beaujolais.grenoble.grid5000.fr/mirrors/debian sid main contrib non-free"
+  f.puts "deb-src http://beaujolais.grenoble.grid5000.fr/mirrors/debian etch main contrib non-free"
 end
 
 File::open('/etc/apt/apt.conf', 'w') do |f|
@@ -89,9 +89,9 @@
 system_r("apt-get install -y dpkg util-linux apt lvm2 nullmailer")
 system_r("apt-get install -y fakeroot pbuilder sbuild schroot debootstrap piuparts lockfile-progs lintian")
 
-system_r("dpkg -i /debcluster-data/piuparts/piuparts*deb")
+system_r("dpkg -i /dc/data/piuparts/piuparts*deb")
 # hacked up sbuild for raphael
-system_r("dpkg -i /debcluster-data/sbuild/sbuild*deb")
+system_r("dpkg -i /dc/data/sbuild/sbuild*deb")
 system_r("apt-get -f install")
 
 system_r("echo 'http_proxy=' > /etc/environment")
@@ -99,7 +99,7 @@
 ENV['http_proxy'] = ''
 
 # do rest of config
-system_r("rm -rf /etc/schroot && cp -r /debcluster-scripts/configs/schroot /etc/schroot && find /etc/schroot -type d -name .svn | xargs rm -rf")
+system_r("rm -rf /etc/schroot && cp -r /dc/debcluster/configs/schroot /etc/schroot && find /etc/schroot -type d -name .svn | xargs rm -rf")
 
 # find location of scratch:
 scratch = `df |grep -e tmp -e scratch |grep -v "^tmpfs" |grep -v idpot |grep -v nfs | sort -r -n -k 2 | awk '{print $6}'`.chomp
@@ -121,35 +121,35 @@
 system_r("mkdir -p #{scratch}/lucas/approx &>/dev/null")
 system_r("ln -sf #{scratch}/lucas/approx /var/cache/approx")
 system_r("apt-get install -y approx")
-system_r("cp /debcluster-scripts/configs/approx.conf /etc/approx/approx.conf && /etc/init.d/approx restart")
+system_r("cp /dc/debcluster/configs/approx.conf /etc/approx/approx.conf && /etc/init.d/approx restart")
 
 system_r("mkdir -p /var/lib/schroot/mount /var/lib/schroot/session")
 
-system_r("cp /debcluster-scripts/configs/etcsbuild.conf /etc/sbuild/sbuild.conf")
-system_r("cp /debcluster-scripts/configs/dotsbuildrc /root/.sbuildrc")
+system_r("cp /dc/debcluster/configs/etcsbuild.conf /etc/sbuild/sbuild.conf")
+system_r("cp /dc/debcluster/configs/dotsbuildrc /root/.sbuildrc")
 
 system_r("echo 'Defaults:root env_keep+=\"APT_CONFIG DEBIAN_FRONTEND SHELL\"' >> /etc/sudoers")
 system_r("id user || adduser --home /home/user --uid 1001 --ingroup sbuild --disabled-password --gecos User user")
 system_r("/usr/sbin/sbuild-adduser user")
-system_r("cp /debcluster-scripts/configs/dotsbuildrc /home/user/.sbuildrc")
+system_r("cp /dc/debcluster/configs/dotsbuildrc /home/user/.sbuildrc")
 system_r("ls -la /home/user/.sbuildrc")
 
 # prepare net
-system_r("iptables-restore < /debcluster-scripts/configs/iptables.rules")
+system_r("iptables-restore < /dc/debcluster/configs/iptables.rules")
 
 if virt
 # VIRT-specific stuff
   system_r("apt-get -y install screen qemu")
-  system_r("rsync -e 'ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null' -avzP lnussbaum at idpot.grenoble.grid5000.fr:debcluster-data/qemu/hda-mips.qcow2 /debscratch/hda-mips.qcow2")
-#  system_r("tar -C / -xzf /debcluster-data/qemu/qemu-bin.tgz")
-  system_r("cp /debcluster-data/qemu/{initrd.gz,vmlinux-2.6.18-5-qemu} /debscratch")
+  system_r("rsync -e 'ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null' -avzP lnussbaum at beaujolais.grenoble.grid5000.fr:pub/data/qemu/hda-mips.qcow2 /debscratch/hda-mips.qcow2")
+#  system_r("tar -C / -xzf /dc/data/qemu/qemu-bin.tgz")
+  system_r("cp /dc/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/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.puts("/usr/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=/dc/debcluster/configs/qemu-ifup -m 256 -snapshot")
     fd.close
     system("chmod a+x #{f}")
     system("cd /debscratch && screen -d -m \"#{f}\"")

More information about the Collab-qa-commits mailing list