Changeset 1604 in ProjectBuilder for devel/pb

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

Location:

devel/pb

Files:

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

devel/pb/bin/pb

@@ -1578 +1578 @@
                 next unless (/^Source: (\S+)/o);
                 my $tmp = $1;
-                $made = "$made $tmp"."_*.dsc $tmp"."_*.tar.gz $tmp"."_*.deb $tmp"."_*.changes";
+                $made = "$made $tmp"."_*.dsc $tmp"."_*.tar.gz $tmp"."_*.changes";
                 #doesn't work in my case
                 #foreach my $glob (("$1\_*.changes", "$1\_*.dsc", "$1\_*.tar.gz")) {
@@ -1783 +1783 @@
             $made2 .= "$f " if ($f =~ /\.deb$/);
         }
-        if (-x $chkcmd) {
+        if ((defined  $chkcmd) && (-x $chkcmd)) {
             my $ret = pb_system("$chkcmd $chkopt $made2","Checking validity of debs with $chkcmd","mayfail");
             pb_log(0,"ERROR: when checking packages validity\n") if ($ret ne 0);
@@ -1976 +1976 @@
     $delivery->{$ENV{'PBPROJ'}} = "" if (not defined $delivery->{$ENV{'PBPROJ'}});
     my ($sshlogin,$sshport) = pb_conf_get_if($login,$port);
-    $sshport->{$ENV{PBPROJ}} = 22 unless (defined $sshport->{$ENV{PBPROJ}});
-    $sshlogin->{$ENV{PBPROJ}} = getpwuid($UID) unless (defined $sshlogin->{$ENV{PBPROJ}});
+    $sshport->{$ENV{PBPROJ}} = 22 if (not defined $sshport->{$ENV{PBPROJ}});
+    $sshlogin->{$ENV{PBPROJ}} = getpwuid($UID) if (not defined $sshlogin->{$ENV{PBPROJ}});
     my ($vtmout,$vepath);
     # ...Except those in virtual context
@@ -2202 +2202 @@
     arch=`basename \$i | sed 's/binary-//'`
     echo "Packages for \$arch:"
-    dpkg-scanpackages -a\$arch $pbos->{'version'} /dev/null | dists/$pbos->{'version'}/$projcomponent/binary-\$arch/Packages
+    dpkg-scanpackages -a\$arch $pbos->{'version'} /dev/null > dists/$pbos->{'version'}/$projcomponent/binary-\$arch/Packages
     gzip -9 < dists/$pbos->{'version'}/$projcomponent/binary-\$arch/Packages > dists/$pbos->{'version'}/$projcomponent/binary-\$arch/Packages.gz
     bzip2 -9 < dists/$pbos->{'version'}/$projcomponent/binary-\$arch/Packages > dists/$pbos->{'version'}/$projcomponent/binary-\$arch/Packages.bz2
@@ -2312 +2312 @@
     } else {
         my $keyfile = pb_ssh_get(0);
-        my $keyopt = defined $keyfile ? "-i $keyfile" : "";
+        my $keyopt = "";
+        $keyopt = "-i $keyfile" if ((defined $keyfile) && ($cmt !~ /Packages/));
         my $sshcmd = pb_check_req("ssh",1);
         my $scpcmd = pb_check_req("scp",1);

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