Changeset 768

Timestamp:

05/03/09 13:05:58 (4 years ago)

Author:

bruno

Message:

• No snapshot needed if creating the VM
• Remove the VE befor recreating it if snapshot
• Force yum update

Location:

devel

Files:

• pb-modules/lib/ProjectBuilder/Distribution.pm (modified) (1 diff)
• pb/bin/pb (modified) (4 diffs)

devel/pb-modules/lib/ProjectBuilder/Distribution.pm

@@ -134 +134 @@
         $opt="--exclude=*.i?86";
     }
-    $dupd="sudo yum clean all; sudo yum update ; sudo yum -y $opt install ";
+    $dupd="sudo yum clean all; sudo yum -y update ; sudo yum -y $opt install ";
     if ($ddir =~ /fedora/) {
         $dsuf=".fc$dver1";

devel/pb/bin/pb

@@ -1389 +1389 @@
             if ((($vmtype->{$ENV{'PBPROJ'}}) eq "kvm") || (($vmtype->{$ENV{'PBPROJ'}}) eq "qemu")) {
                 use Net::Telnet;
-                my $t = new Net::Telnet (Host => "localhost", Port => $vmmonport->{$ENV{'PBPROJ'}}) || die "Unable to dialog on the monitor";
+                my $t = new Net::Telnet (Timeout => 10, Host => "localhost", Port => $vmmonport->{$ENV{'PBPROJ'}}) || die "Unable to dialog on the monitor";
                 # move to monitor mode
                 my @lines = $t->cmd("c");
@@ -1511 +1511 @@
                 # Configure the monitoring to automize the creation of the 'pb' snapshot
                 $ENV{'PBVMOPT'} .= "-serial mon:telnet::$vmmonport->{$ENV{'PBPROJ'}},server,nowait ";
+                # In that case no snapshot needed
+                $ENV{'PBVMOPT'} =~ s/-snapshot //;
             }
         }
@@ -1661 +1663 @@
                     ($pbsnap eq 1) ||
                     (! -d "$vepath->{$ENV{'PBPROJ'}}/$ddir/$dver/$darch"))) {
-                        pb_system("sudo mkdir -p $vepath->{$ENV{'PBPROJ'}}/$ddir/$dver/$darch ; sudo tar xz  -C $vepath->{$ENV{'PBPROJ'}}/$ddir/$dver/$darch -f $vepath->{$ENV{'PBPROJ'}}/$ddir-$dver-$darch.tar.gz","Extracting snapshot of $ddir-$dver-$darch.tar.gz under $vepath->{$ENV{'PBPROJ'}}/$ddir/$dver/$darch");
+                        pb_system("sudo sudo rm -rf $vepath->{$ENV{'PBPROJ'}}/$ddir/$dver/$darch ; mkdir -p $vepath->{$ENV{'PBPROJ'}}/$ddir/$dver/$darch ; sudo tar xz  -C $vepath->{$ENV{'PBPROJ'}}/$ddir/$dver/$darch -f $vepath->{$ENV{'PBPROJ'}}/$ddir-$dver-$darch.tar.gz","Extracting snapshot of $ddir-$dver-$darch.tar.gz under $vepath->{$ENV{'PBPROJ'}}/$ddir/$dver/$darch");
             }
             # Nothing more to do for VE. No real launch
@@ -2275 +2277 @@
 EOF
     if ($vtype eq "vm") {
-        print SCRIPT "sleep 3600\n";
+        print SCRIPT "sleep 120\n";
     } else {
         print SCRIPT "sleep 1\n";