Legend:
- Unmodified
- Added
- Removed
-
devel/pb/bin/pb
r1603 r1604 1578 1578 next unless (/^Source: (\S+)/o); 1579 1579 my $tmp = $1; 1580 $made = "$made $tmp"."_*.dsc $tmp"."_*.tar.gz $tmp"."_*. deb $tmp"."_*.changes";1580 $made = "$made $tmp"."_*.dsc $tmp"."_*.tar.gz $tmp"."_*.changes"; 1581 1581 #doesn't work in my case 1582 1582 #foreach my $glob (("$1\_*.changes", "$1\_*.dsc", "$1\_*.tar.gz")) { … … 1783 1783 $made2 .= "$f " if ($f =~ /\.deb$/); 1784 1784 } 1785 if ( -x $chkcmd) {1785 if ((defined $chkcmd) && (-x $chkcmd)) { 1786 1786 my $ret = pb_system("$chkcmd $chkopt $made2","Checking validity of debs with $chkcmd","mayfail"); 1787 1787 pb_log(0,"ERROR: when checking packages validity\n") if ($ret ne 0); … … 1976 1976 $delivery->{$ENV{'PBPROJ'}} = "" if (not defined $delivery->{$ENV{'PBPROJ'}}); 1977 1977 my ($sshlogin,$sshport) = pb_conf_get_if($login,$port); 1978 $sshport->{$ENV{PBPROJ}} = 22 unless (defined $sshport->{$ENV{PBPROJ}});1979 $sshlogin->{$ENV{PBPROJ}} = getpwuid($UID) unless (defined $sshlogin->{$ENV{PBPROJ}});1978 $sshport->{$ENV{PBPROJ}} = 22 if (not defined $sshport->{$ENV{PBPROJ}}); 1979 $sshlogin->{$ENV{PBPROJ}} = getpwuid($UID) if (not defined $sshlogin->{$ENV{PBPROJ}}); 1980 1980 my ($vtmout,$vepath); 1981 1981 # ...Except those in virtual context … … 2202 2202 arch=`basename \$i | sed 's/binary-//'` 2203 2203 echo "Packages for \$arch:" 2204 dpkg-scanpackages -a\$arch $pbos->{'version'} /dev/null |dists/$pbos->{'version'}/$projcomponent/binary-\$arch/Packages2204 dpkg-scanpackages -a\$arch $pbos->{'version'} /dev/null > dists/$pbos->{'version'}/$projcomponent/binary-\$arch/Packages 2205 2205 gzip -9 < dists/$pbos->{'version'}/$projcomponent/binary-\$arch/Packages > dists/$pbos->{'version'}/$projcomponent/binary-\$arch/Packages.gz 2206 2206 bzip2 -9 < dists/$pbos->{'version'}/$projcomponent/binary-\$arch/Packages > dists/$pbos->{'version'}/$projcomponent/binary-\$arch/Packages.bz2 … … 2312 2312 } else { 2313 2313 my $keyfile = pb_ssh_get(0); 2314 my $keyopt = defined $keyfile ? "-i $keyfile" : ""; 2314 my $keyopt = ""; 2315 $keyopt = "-i $keyfile" if ((defined $keyfile) && ($cmt !~ /Packages/)); 2315 2316 my $sshcmd = pb_check_req("ssh",1); 2316 2317 my $scpcmd = pb_check_req("scp",1); -
devel/pb/t/pbtest
r1603 r1604 12 12 13 13 # You may have multiple distros here 14 TESTVEDIST="debian-6.0-x86_64 ubuntu-12.04-i386 fedora-16-x86_64 opensuse-12.1-x86_64 mageia-2-i386 mandriva-201 1.0-i386"14 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" 15 15 # Only one VM is tested for now. 16 16 TESTVMDIST="fedora-16-i386" … … 76 76 cat > /tmp/sudoers << EOF 77 77 Defaults env_keep += "PBPROJ" 78 # This is for the $PBUSER account in the VEonly78 # This is for the $PBUSER account for the VE and VM only 79 79 $PBUSER ALL=NOPASSWD:/usr/sbin/chroot 80 80 $PBUSER ALL=NOPASSWD:/usr/bin/rpmbootstrap … … 85 85 $PBUSER ALL=NOPASSWD:/bin/tar 86 86 $PBUSER ALL=NOPASSWD:/bin/mkdir 87 $PBUSER ALL=NOPASSWD:/ bin/chown87 $PBUSER ALL=NOPASSWD:/usr/bin/qemu-kvm 88 88 EOF 89 89 sudocmd "cat /etc/sudoers /tmp/sudoers > /tmp/sudoers2" … … 156 156 vmsize fedora = 10G 157 157 vmmonport default = 4000 158 vmlogin default = $PBUSER 158 159 EOF 159 160 echo "vmlist default = `echo $TESTVMDIST | sed 's/ /,/g'`" >> /tmp/.pbrc … … 341 342 sudopbtest "svn ci $VCSOPT -m 'sync before newver' $PBTEST/pb" 342 343 sudopbtest "PBVCSOPT=\"$VCSOPT\" pb -r 2.5 -V 2.6 newver" 343 sudopbtest "pb -r 2.6 sbx2pkg" 344 sudopbtest "pb clean"344 # We now need to adapt tar file,log ... to a 2.6 content 345 #sudopbtest "pb -r 2.6 sbx2pkg" 345 346 346 347 # need tobe part of group video for KVM 347 sudocmd "grep - q $PBUSER /etc/group"348 sudocmd "grep -Eq '^video:' /etc/group | grep $PBUSER" 348 349 if [ $? -ne 0 ]; then 349 sudocmd "perl -pi -e 's|^(video:.*)$|$1, |' /etc/shadow"350 sudocmd "perl -pi -e 's|^(video:.*)$|$1,$ENV{'PBUSER'}|' /etc/shadow" 350 351 fi 351 352 d=mageia-2-i386 352 353 sudopbtest "qemu-img create -f qcow2 $PBTEST/vm/$d.qemu 72G" 353 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"354 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" 354 355 sudopbtest "pb -p pb -r devel -m $d sbx2setupvm" 355 356 sudopbtest "pb -p pb -m $d snapvm" 356 357 sudopbtest "pb -m $d sbx2vm" 357 358 358 359 359 # test also with MondoRescue 360 360 pb -p mondorescue -r branches/3.0 cms2pkg 361 361 362 362 # cleanup 363 sudopbtest "pb clean" 363 364 sudopbtest "killall svnserve" 1 364 365
Note:
See TracChangeset
for help on using the changeset viewer.