Changeset 135


Ignore:
Timestamp:
Sep 11, 2007, 1:04:43 AM (10 years ago)
Author:
bruno
Message:

delivery in ssh delivery should only be used for VMs

File:
1 edited

Legend:

Unmodified
Added
Removed
  • 0.7.4/pb/bin/pb

    r132 r135  
    434434        $tdir = "$sshdir->{$ENV{'PBPROJ'}}/src";
    435435    } elsif ($cmt eq "VMs") {
    436         $tdir = dirname("$sshdir->{$ENV{'PBPROJ'}}");
     436        $tdir = dirname("$sshdir->{$ENV{'PBPROJ'}}")."/delivery";
    437437    } elsif ($cmt eq "Packages") {
    438438        $tdir = "$sshdir->{$ENV{'PBPROJ'}}/$ddir/$dver";
     
    444444
    445445    $port = $sshport->{$ENV{'PBPROJ'}};
    446     pb_system("ssh -q -p $port $mac \"mkdir -p $tdir/delivery ; cd $tdir/delivery ; rm -f $basesrc\"","Preparing $tdir on $mac");
    447     pb_system("scp -p -P $port $src $mac:$tdir/delivery","$cmt delivery in $tdir on $mac");
    448     pb_system("ssh -q -p $port $mac \"echo \'cd $tdir/delivery ; if [ -f pbscript ]; then ./pbscript; fi\' | bash\"","Executing pbscript on $mac  if needed");
     446    pb_system("ssh -q -p $port $mac \"mkdir -p $tdir ; cd $tdir ; rm -f $basesrc\"","Preparing $tdir on $mac");
     447    pb_system("scp -p -P $port $src $mac:$tdir","$cmt delivery in $tdir on $mac");
     448    pb_system("ssh -q -p $port $mac \"echo \'cd $tdir ; if [ -f pbscript ]; then ./pbscript; fi\' | bash\"","Executing pbscript on $mac  if needed");
    449449    if ($cmt eq "VMs") {
    450450        # Get back info on pkg produced, compute their name and get them from the VM
    451         pb_system("scp -p -P $port $mac:$tdir/delivery/pbgen-$pbprojver-$pbprojtag $ENV{'PBBUILDDIR'}","Get package names in $tdir on $mac");
     451        pb_system("scp -p -P $port $mac:$tdir/pbgen-$pbprojver-$pbprojtag $ENV{'PBBUILDDIR'}","Get package names in $tdir on $mac");
    452452        open(KEEP,"$ENV{'PBBUILDDIR'}/pbgen-$pbprojver-$pbprojtag") || die "Unable to read $ENV{'PBBUILDDIR'}/pbgen-$pbprojver-$pbprojtag";
    453453        my $src = <KEEP>;
     
    456456        $src =~ s/^ *//;
    457457        $src =~ s/ +/,/g;
    458         pb_system("scp -p -P $port $mac:$tdir/delivery/{$src} $ENV{'PBBUILDDIR'}/$odir/$over","Package recovery of in $tdir from $mac");
    459         #pb_system("ssh -q -p $port $mac \"rm -rf $tdir ; sido /usr/bin/poweroff\"","VM cleanup and halt on $mac");
     458        pb_system("scp -p -P $port $mac:$tdir/{$src} $ENV{'PBBUILDDIR'}/$odir/$over","Package recovery of in $tdir from $mac");
     459        #pb_system("ssh -q -p $port $mac \"rm -rf dirname("$sshdir->{$ENV{'PBPROJ'}}"); sudo /usr/bin/poweroff\"","VM cleanup and halt on $mac");
    460460        pb_send2ssh("Packages","$odir"."_"."$over");
    461461        pb_rm_rf("$ENV{'PBBUILDDIR'}/$odir");
Note: See TracChangeset for help on using the changeset viewer.