Changeset 141 in ProjectBuilder

Timestamp:

Sep 13, 2007, 2:47:30 AM (18 years ago)

Author:

Bruno Cornec

Message:

First completely good version for VM management

File:

• devel/pb/bin/pb (modified) (8 diffs)

devel/pb/bin/pb

@@ -34 +34 @@
 my $pbtag;                  # Global Tag variable
 my $pbver;                  # Global Version variable
+my $pbscript;               # Name of the script
 my %pbver;                  # per package
 my %pbtag;                  # per package
@@ -43 +44 @@
 my $LOG = \*STDOUT;
 
-getopts('hl:m:p:qr:tv',\%opts);
+getopts('hl:m:p:qr:s:tv',\%opts);
 
 my ($projectbuilderver,$projectbuilderrev) = pb_version_init();
@@ -75 +76 @@
 if (defined $opts{'m'}) {
     $ENV{'PBVM'} = $opts{'m'};
+}
+if (defined $opts{'s'}) {
+    $pbscript = $opts{'s'};
 }
 
@@ -117 +121 @@
     pb_cms2build();
     pb_build2vm();
+} elsif ($action =~ /^launchvm$/) {
+    pb_launchvm();
 } elsif ($action =~ /^clean$/) {
 } else {
@@ -456 +462 @@
         # Change pgben to make the next send2ssh happy
         open(KEEP,"> $ENV{'PBBUILDDIR'}/pbgen-$pbprojver-$pbprojtag") || die "Unable to write $ENV{'PBBUILDDIR'}/pbgen-$pbprojver-$pbprojtag";
-        my $made = "";
         foreach my $p (split(/ +/,$src)) {
             my $j = basename($p);
             pb_system("scp -p -P $port $mac:\'$bdir/$p\' $ENV{'PBBUILDDIR'}/$odir/$over 2> /dev/null","Package recovery of $j in $tdir from $mac");
-            $made = "$made $odir/$over/$j";
-        }
-        print KEEP "$made\n";
+        }
+        print KEEP "$odir/$over/*\n";
         close(KEEP);
         #pb_system("ssh -q -p $port $mac \"rm -rf dirname("$sshdir->{$ENV{'PBPROJ'}}"); sudo /usr/bin/poweroff\"","VM cleanup and halt on $mac");
         pb_send2ssh("Packages","$odir"."_"."$over");
-        #pb_rm_rf("$ENV{'PBBUILDDIR'}/$odir");
-    }
-}
-
+        pb_rm_rf("$ENV{'PBBUILDDIR'}/$odir");
+    }
+}
+
+sub launchvm {
+    my ($vm,$all) = pb_get_vm();
+
+    # Prepare the script to be executed on the VM
+    # in $ENV{'PBDESTDIR'}/pbscript
+    copy($pbscript,"$ENV{'PBDESTDIR'}/pbscript") || die "Unable to create $ENV{'PBDESTDIR'}/pbscript";
+    chmod 0755,"$ENV{'PBDESTDIR'}/pbscript";
+
+    foreach my $v (@$vm) {
+        # Launch the VMs
+        my ($ptr,$vmopt,$vmport,$vmpath) = pb_conf_get("vmtype","vmopt","vmport","vmpath");
+        my $vmtype = $ptr->{$ENV{'PBPROJ'}};
+        if (defined $vmopt->{$ENV{'PBPROJ'}}) {
+            $ENV{'PBVMOPT'} = $vmopt->{$ENV{'PBPROJ'}};
+        } else {
+            $ENV{'PBVMOPT'} = "";
+        }
+
+        my $cmd;
+        if ($vmtype eq "qemu") {
+            my $arch = `uname -m`;
+            chomp($arch);
+            my $qemucmd;
+            my $qemucmd32;
+            my $qemucmd64;
+            if ($arch eq "x86_64") {
+                $qemucmd32 = "/usr/bin/qemu-system-i386";
+                $qemucmd64 = "/usr/bin/qemu";
+            } else {
+                $qemucmd32 = "/usr/bin/qemu";
+                $qemucmd64 = "/usr/bin/qemu-system-x86_64";
+            }
+            if ($v =~ /_64/) {
+                $qemucmd = "$qemucmd64 -no-kqemu";
+            } else {
+                $qemucmd = "$qemucmd32";
+            }
+            if (! -f "$vmpath->{$ENV{'PBPROJ'}}/$v.qemu") {
+                print "Unable to find VM $vmpath->{$ENV{'PBPROJ'}}/$v.qemu";
+                next;
+            }
+            $cmd = "$qemucmd $ENV{'PBVMOPT'} -redir tcp:$vmport->{$ENV{'PBPROJ'}}:10.0.2.15:22 $vmpath->{$ENV{'PBPROJ'}}/$v.qemu"
+        } elsif ($vmtype eq "xen") {
+        } elsif ($vmtype eq "vmware") {
+        } else {
+            die "VM of type $vmtype not supported. Report to the dev team";
+        }
+        pb_system("$cmd &","Launching the VM");
+        pb_system("sleep 300","Waiting for it to come up");
+
+        # Gather all required files to send them to the VM and launch the build thourgh pbscript
+        pb_send2ssh("VMs","$v","vmhost","vmlogin","pbrc","vmport");
+    }
+}
 sub pb_build2vm {
     my ($vm,$all) = pb_get_vm();
@@ -610 +668 @@
     print "pb (aka project-builder) Version $projectbuilderver-$projectbuilderrev\n";
     print "\n";
-    print "Syntax: pb [-vhqt][-r pbroot][-p project][-m \"mach-1[,...]\"] <action> [<pkg1>...]\n";
+    print "Syntax: pb [-vhqt][-r pbroot][-p project][[-s script] -m \"mach-1[,...]\"] <action> [<pkg1>...]\n";
     print "\n";
     print "-h : This help file\n";
@@ -617 +675 @@
     print "-v : Verbose mode\n";
     print "\n";
-    print "-m machine : Name of the virtual Machines you want\n";
+    print "-m machine : Name of the Virtual Machines you want\n";
     print "             to build on (space separated). All if none precised\n";
     print "             (or use the env variable PBVM)       \n";
+    print "\n";
+    print "-s script  : Name of the script you want\n";
+    print "             to execute on the related VMs.\n";
     print "\n";
     print "-p project : Name of the project you're working on\n";
@@ -646 +707 @@
     print "\t           VM supported are QEMU                 \n";
     print "\n";
+    print "\tlaunchvm:  Launch a virtual machine and execute potentially\n";
+    print "\t           a script on it\n";
+    print "\n";
     print "\tcms2vm:    cms2build + build2vm\n";
     print "\n";