Changeset 1604 in ProjectBuilder for devel/pb/t

Timestamp:

May 27, 2012, 4:45:34 AM (12 years ago)

Author:

Bruno Cornec

Message:

• Fix an error in the Package file generation for deb repo
• more pbtest fine tune
• Review again pb_system msgs

File:

• devel/pb/t/pbtest (modified) (5 diffs)

devel/pb/t/pbtest

@@ -12 +12 @@
 
 # You may have multiple distros here
-TESTVEDIST="debian-6.0-x86_64 ubuntu-12.04-i386 fedora-16-x86_64 opensuse-12.1-x86_64 mageia-2-i386 mandriva-2011.0-i386"
+TESTVEDIST="debian-6.0-x86_64 ubuntu-12.04-i386 fedora-16-x86_64 opensuse-12.1-x86_64 mageia-2-i386 mandriva-2010.1-i386"
 # Only one VM is tested for now.
 TESTVMDIST="fedora-16-i386"
@@ -76 +76 @@
     cat > /tmp/sudoers << EOF
 Defaults env_keep += "PBPROJ"
-# This is for the $PBUSER account in the VE only
+# This is for the $PBUSER account for the VE and VM only
 $PBUSER ALL=NOPASSWD:/usr/sbin/chroot
 $PBUSER ALL=NOPASSWD:/usr/bin/rpmbootstrap
@@ -85 +85 @@
 $PBUSER ALL=NOPASSWD:/bin/tar
 $PBUSER ALL=NOPASSWD:/bin/mkdir
-$PBUSER ALL=NOPASSWD:/bin/chown
+$PBUSER ALL=NOPASSWD:/usr/bin/qemu-kvm
 EOF
     sudocmd "cat /etc/sudoers /tmp/sudoers > /tmp/sudoers2"
@@ -156 +156 @@
 vmsize fedora = 10G
 vmmonport default = 4000
+vmlogin default = $PBUSER
 EOF
 echo "vmlist default = `echo $TESTVMDIST | sed 's/ /,/g'`" >> /tmp/.pbrc
@@ -341 +342 @@
 sudopbtest "svn ci $VCSOPT -m 'sync before newver' $PBTEST/pb"
 sudopbtest "PBVCSOPT=\"$VCSOPT\" pb -r 2.5 -V 2.6 newver"
-sudopbtest "pb -r 2.6 sbx2pkg"
-sudopbtest "pb clean"
+# We now need to adapt tar file,log ... to a 2.6 content
+#sudopbtest "pb -r 2.6 sbx2pkg"
 
 # need tobe part of group video for KVM
-sudocmd "grep -q $PBUSER /etc/group"
+sudocmd "grep -Eq '^video:' /etc/group | grep $PBUSER"
 if [ $? -ne 0 ]; then
-    sudocmd "perl -pi -e 's|^(video:.*)$|$1,|' /etc/shadow"
+    sudocmd "perl -pi -e 's|^(video:.*)$|$1,$ENV{'PBUSER'}|' /etc/shadow"
 fi
 d=mageia-2-i386
 sudopbtest "qemu-img create -f qcow2 $PBTEST/vm/$d.qemu 72G"
-sudopbtest "qemu-kvm -m 1024 -kernel /pub/mageia/distrib/2/i586/isolinux/alt0/vmlinuz -initrd /pub/mageia/distrib/2/i586/isolinux/alt0/all.rdz -append "ramdisk_size=128000 root=/dev/ram3 kickstart=http://192.168.8.55/pub/ks/guerrero/ks.pl automatic=method:http,server:192.168.8.55,directory:/pub/mageia/distrib/2/i586,network:dhcp" -drive file=$PBTEST/vm/$d.qemu,if=virtio,media=disk -redir tcp:2200:10.0.2.15:22"
+sudopbtest "sudo qemu-kvm -m 1024 -kernel /pub/mageia/distrib/2/i586/isolinux/alt0/vmlinuz -initrd /pub/mageia/distrib/2/i586/isolinux/alt0/all.rdz -append "ramdisk_size=128000 root=/dev/ram3 kickstart=http://192.168.8.55/pub/ks/guerrero/ks.pl automatic=method:http,server:192.168.8.55,directory:/pub/mageia/distrib/2/i586,network:dhcp" -drive file=$PBTEST/vm/$d.qemu,if=virtio,media=disk -redir tcp:2200:10.0.2.15:22"
 sudopbtest "pb -p pb -r devel -m $d sbx2setupvm"
 sudopbtest "pb -p pb -m $d snapvm"
 sudopbtest "pb -m $d sbx2vm"
 
-
 # test also with MondoRescue
 pb -p mondorescue -r branches/3.0 cms2pkg
 
 # cleanup
+sudopbtest "pb clean"
 sudopbtest "killall svnserve" 1