Changeset 1942 in ProjectBuilder for devel/pb/bin

Timestamp:

Feb 5, 2015, 10:54:32 PM (10 years ago)

Author:

Bruno Cornec

Message:

• pb works again with VMs (pbaccount is now a ENV var and the script executed is now without a full path name and the port used is now correct again)

File:

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

devel/pb/bin/pb

@@ -56 +56 @@
 my %pbscript;                       # Name of the scripts per V
 my $pbrev;                          # Global REVISION variable
-my $pbaccount;                      # Login to use to connect to the VM/RM
 my $pbtarget = undef;               # Target os-ver-arch you want to build for
 my $pbport;                         # Port to use to connect to the VM/RM
@@ -462 +461 @@
 
 None exists for the moment.
+
+=head1 ENVIRONMENT VARIABLES
+
+=item B<PBACCOUNT>   
+
+Login to use to connect to the VM/RM, undef by default
+
+=back
 
 =head1 CONFIGURATION FILES
@@ -757 +764 @@
 }
 if (defined $opts{'a'}) {
-    $pbaccount = $opts{'a'};
+    $ENV{'PBACCOUNT'} = $opts{'a'};
     die "option -a requires a -s script option" if (not defined $pbscript{'default'});
 }
@@ -1941 +1948 @@
 
     # Keep track of what is generated so that we can get them back from VMs/RMs
-    my $pbkeep = "$ENV{'PBBUILDDIR'}/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}-$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}";
-    open(KEEP,"> $pbkeep") || die "Unable to create $pbkeep: $!";
+    my $pbstore = "$ENV{'PBBUILDDIR'}/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}-$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}";
+    open(KEEP,"> $pbstore") || die "Unable to create $pbstore $!";
     print KEEP "$made\n";
     close(KEEP);
@@ -2138 +2145 @@
     if ($cmt !~ /^VE/) {
         $mac = "$sshlogin->{$ENV{'PBPROJ'}}\@$remhost";
-        # Overwrite account value if passed as parameter
-        $mac = "$pbaccount\@$remhost" if (defined $pbaccount);
-        pb_log(2, "DEBUG: pbaccount: $pbaccount => mac: $mac\n") if (defined $pbaccount);
+        # Overwrite account value if passed as parameter or forced
+        $mac = "$ENV{'PBACCOUNT'}\@$remhost" if (defined $ENV{'PBACCOUNT'});
     } else {
         # VE
+        $mac = $sshlogin->{$ENV{'PBPROJ'}};
         # Overwrite account value if passed as parameter (typically for setup2v)
-        $mac = $sshlogin->{$ENV{'PBPROJ'}};
-        $mac = $pbaccount if (defined $pbaccount);
-    }
+        $mac = $ENV{'PBACCOUNT'} if (defined $ENV{'PBACCOUNT'});
+    }
+    pb_log(2, "DEBUG: mac: $mac\n");
 
     my $tdir;
@@ -2586 +2593 @@
             }
         } else {
-            pb_system("$cpcmd $ENV{'PBDESTDIR'}/ProjectBuilder-$pbver1$pbextdir.tar.gz $ENV{'PBDESTDIR'}/project-builder-$pbver2$pbextdir.tar.gz $mac:/tmp","Copying local project files to $vetype.");
+            pb_system("$cpcmd $ENV{'PBDESTDIR'}/ProjectBuilder-$pbver1$pbextdir.tar.gz $ENV{'PBDESTDIR'}/project-builder-$pbver2$pbextdir.tar.gz $mac:/tmp","Copying local project files to VM/RM");
         }
     }
@@ -2640 +2647 @@
             #$dkcmd .= "/bin/bash $homedir/$tdir-2/".basename($pbscript1)." ;  if [ '$pbkeep' == '0' ]; then rm -f $pbscript1; fi ; ";
         } else {
-            $shcmd .= " \"echo \'cd $tdir ; if [ -x $pbscript1 ]; then $pbscript1; fi ;  if [ $pbkeep == 0 ]; then rm -f $pbscript1; fi\' | bash\"";
+            my $s = basename($pbscript1);
+            $shcmd .= " \"echo \'cd $tdir ; if [ -x $s ]; then ./$s; fi ;  if [ $pbkeep == 0 ]; then rm -f $s; fi\' | bash\"";
         }
     }
@@ -2728 +2736 @@
 
             # We want to send them to the ssh account so overwrite what has been done before
-            undef $pbaccount;
             pb_log(2,"Before sending pkgs, vexist: $vexist, vpid: $vpid\n");
-            pb_send2target("Packages","$ENV{'PBDESTDIR'}/pbscript.$$",$pbos->{'name'}."-".$pbos->{'version'}."-".$pbos->{'arch'},$vexist,$vpid);
+            pb_send2target("Packages","$ENV{'PBDESTDIR'}/pbscript.$$",$pbos->{'name'}."-".$pbos->{'version'}."-".$pbos->{'arch'},$vexist,$vpid,undef,undef,undef);
             pb_rm_rf("$ENV{'PBBUILDDIR'}/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}");
         }
@@ -2858 +2865 @@
     ($vexist,$vpid) = pb_launchv($pbscript,$vtype,$v,$action,$pbstep,$pbforce,$snapme,$pbsnap,$pbimage);
     
-    # Skip that V if something went wrong
-    if (($vpid == 0) && ($vexist == 0)) {
+    # Skip that VM/RM if something went wrong
+    if (($vtype =~ /(v|r)m/) && ($vpid == 0) && ($vexist == 0)) {
         $pm->finish if (defined $pbparallel);
         next;
     }
+    
     $pm->finish if (defined $pbparallel);
 }
@@ -2996 +3004 @@
     ($vexist,$vmmport) = pb_check_ps($tmpcmd,$vmm);
     $vpid = 0;
+    
     if (! $vexist) {
         if ($pbstep == 0) {
@@ -3032 +3041 @@
         }
     } else {
-        pb_log(0,"Found an existing VM $vmm (pid $vexist)\n");
+        pb_log(0,"Found an existing VM $vmm (pid $vexist - Port $vmmport)\n");
         # Set the correct port here based on what is done
         $pbport = $vmmport;
@@ -3483 +3492 @@
     my ($pbac) = pb_conf_get($vtype."login");
     my ($key,$zero0,$zero1,$zero2);
-    my ($vexist,$vpid);
 
     # Prepare the script to be executed on the VM/VE/RM
@@ -3534 +3542 @@
         $nport = pb_get_port($vmport,$pbos,$vtype);
     
-        # Skip that VM/RM if something went wrong
-        next if (($vpid == 0) && ($vexist == 0));
-    
         # Store the pub key part in a variable
         open(FILE,"$keyfile.pub") || die "Unable to open $keyfile.pub";
@@ -3671 +3676 @@
     }
 
+# TODO: systemd support
 # Keep the VM in text mode
 $file="/etc/inittab";
@@ -3912 +3918 @@
     chmod 0755,"$pbscript{$v}";
 
-    # That build script needs to be run as root and force stop of VM at end
-    $pbaccount = "root";
-
-    # Force shutdown of VM except if it was already launched
-    # TODO: FIX here as it doesn't work anymore
-    my $pbforce = 0;
-    if ((! $vexist) && ($vtype eq "vm")) {
-        $pbforce = 1;
-    }
-    
     $pm->finish if (defined $pbparallel);
 }
 $pm->wait_all_children if (defined $pbparallel);
 die "Aborting, one or more of the children failed." if ((not $all_ok) && ($Global::pb_stop_on_error));
+
+# These build scripts need to be run as root and force stop of VM at end
+$ENV{'PBACCOUNT'} = "root";
 
 $sbx = "" if (not defined $sbx);
@@ -4693 +4692 @@
     $nport = "$pbport" if (defined $pbport);
     # Maybe in // mode so use the env var set up as an offset to the base port
-    $nport += $ENV{'PBVMPORT'} if ((defined $pbparallel) && (defined $ENV{'PBVMPORT'}));
+    $nport = $nport + $ENV{'PBVMPORT'} -1 if ((defined $pbparallel) && (defined $ENV{'PBVMPORT'}));
 }
 pb_log(2,"pb_get_port returns $nport\n");