Changeset 108 in ProjectBuilder for devel/pb/bin

Timestamp:

Sep 6, 2007, 2:18:18 AM (17 years ago)

Author:

Bruno Cornec

Message:

Lots of changes to prepare the dev of the VMs support.
No more global variables
Support $ENV{'HOME'} in pbrc for pbrc keyword (allows portability across accounts and share of .pbrc)
Fixes on pb_cms_export for SVN in order to be called externally
pn_env_init retunrs now a lot of params in a list
pb_get_pkg needs params and is simplified by consequence
pbinit is called with a simple system. pb_system has isues with cascading stdout/stderr redirections
pb_send2ssh now supports sending to VM + launch of a pbscript if it exists and it should bring back packages from VM in the future and it now supports more parameters.

File:

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

devel/pb/bin/pb

@@ -21 +21 @@
 
 # Global variables
-use vars qw (%defpkgdir %extpkgdir %filteredfiles %pbrc $debug $LOG);
-
 use lib qw (lib);
 use ProjectBuilder::Distribution qw (pb_distro_init);
@@ -41 +39 @@
 my @date=(localtime->sec(), localtime->min(), localtime->hour(), localtime->mday(), localtime->mon(), localtime->year(), localtime->wday(), localtime->yday(), localtime->isdst());
 my $pbdate = strftime("%Y-%m-%d", @date);
+my $debug = 0;
+my $LOG = \*STDOUT;
 
 getopts('hl:m:p:qr:tv',\%opts);
@@ -67 +67 @@
 }
 
+# Handle root of the project if defined
+if (defined $opts{'r'}) {
+    $ENV{'PBROOT'} = $opts{'r'};
+}
+# Handle virtual machines if any
+if (defined $opts{'m'}) {
+    $ENV{'PBVM'} = $opts{'m'};
+}
+
 # Get Action
 $action = shift @ARGV;
 die pb_syntax() if (not defined $action);
 
-# Handle root of the project if defined
-if (defined $opts{'r'}) {
-    $ENV{'PBROOT'} = $opts{'r'};
-}
-# Handle virtual machines if any
-if (defined $opts{'m'}) {
-    $ENV{'PBVM'} = $opts{'m'};
-}
+my ($pbrc, $filteredfiles, $defpkgdir, $extpkgdir);
+
 # Handles project name if any
+# And get global params
 if (defined $opts{'p'}) {
     ($ENV{'PBPROJ'},$debug,$LOG, $pbrc, $filteredfiles, $defpkgdir, $extpkgdir) 
@@ -87 +91 @@
     = pb_env_init();
 }
-
-print $LOG "Project $ENV{'PBPROJ'}\n" if ($debug >= 0);
+my %pbrc = %$pbrc;
+my %filteredfiles = %$filteredfiles;
+my %defpkgdir = %$defpkgdir;
+my %extpkgdir = %$extpkgdir;
+
+print $LOG "Project: $ENV{'PBPROJ'}\n" if ($debug >= 0);
 print $LOG "Action: $action\n" if ($debug >= 0);
 
@@ -125 +133 @@
 sub pb_cms2build {
 
-    my $ptr = pb_get_pkg();
+    my $ptr = pb_get_pkg(\%defpkgdir,\%extpkgdir);
     @pkgs = @$ptr;
     my $cms=pb_cms_init($ENV{'PBPROJ'},$pbdate);
@@ -224 +232 @@
             if (defined $ptr) {
                 foreach my $f (values %bfiles) {
-                    pb_filter_file_pb("$ENV{'PBROOT'}/$f",$ptr,"$dest/pbconf/$ddir-$dver/".basename($f),$dtype,$pbsuf,$pbpkg,$pbver,$pbtag,$pbrev,$pbdate);
+                    pb_filter_file_pb("$ENV{'PBROOT'}/$f",$ptr,"$dest/pbconf/$ddir-$dver/".basename($f),$dtype,$pbsuf,$pbpkg,$pbver,$pbtag,$pbrev,$pbdate,\%defpkgdir,\%extpkgdir);
                 }
                 if (defined $filteredfiles{$pbpkg}) {
@@ -245 +253 @@
         # Prepare the dest directory for archive
         if (-x "$ENV{'PBCONF'}/$pbpkg/pbinit") {
-            pb_system("cd $dest ; $ENV{'PBCONF'}/$pbpkg/pbinit","Executing init script $ENV{'PBCONF'}/$pbpkg/pbinit");
+            #pb_system("cd $dest ; $ENV{'PBCONF'}/$pbpkg/pbinit","Executing init script $ENV{'PBCONF'}/$pbpkg/pbinit");
+            print $LOG "Executing init script $ENV{'PBCONF'}/$pbpkg/pbinit\n";
+            system("cd $dest ; $ENV{'PBCONF'}/$pbpkg/pbinit");
         }
 
@@ -283 +293 @@
 
     # Get list of packages to build
-    my $ptr = pb_get_pkg();
+    my $ptr = pb_get_pkg(\%defpkgdir,\%extpkgdir);
     @pkgs = @$ptr;
 
@@ -343 +353 @@
 }
 
+# By default deliver to the the public site hosting the 
+# ftp structure (or whatever) or a VM
 sub pb_send2ssh {
 
     my $cmt = shift;
+    my $host = shift || "sshhost";
+    my $login = shift || "sshlogin";
+    my $dir = shift || "sshdir";
+    my $port = shift || "sshport";
 
     my @src;
 
     # Get list of packages to build
-    my $ptr = pb_get_pkg();
+    my $ptr = pb_get_pkg(\%defpkgdir,\%extpkgdir);
     @pkgs = @$ptr;
 
@@ -370 +386 @@
         if ($cmt eq "Sources") {
             $src="$ENV{'PBDESTDIR'}/$pbpkg-$pbver.tar.gz";
+        } elsif ($cmt eq "VMs") {
+            $src="$ENV{'PBDESTDIR'}/$pbpkg-$pbver.tar.gz $ENV{'PBDESTDIR'}/pbscript $ENV{'PBETC'}";
         } elsif ($cmt eq "Packages") {
             if ($dtype eq "rpm") {
@@ -383 +401 @@
                 die "Unknown dtype format $dtype";
             }
+            # Also make a pbscript to generate yum/urpmi/apt bases
+            # $src = "$src $ENV{'PBDESTDIR'}/pbscript"
         }
         print $LOG "$cmt: $src\n" if ($debug >= 0);
         push @src, $src;
     }
-    my ($sshhost,$sshlogin,$sshdir) = pb_conf_get("sshhost", "sshlogin", "sshdir");
+    my ($sshhost,$sshlogin,$sshdir,$sshport) = pb_conf_get($host,$login,$dir,$port);
     my $mac = "$sshlogin->{$ENV{'PBPROJ'}}\@$sshhost->{$ENV{'PBPROJ'}}";
-    my $dir;
+    my $tdir;
     if ($cmt eq "Sources") {
-        $dir = "$sshdir->{$ENV{'PBPROJ'}}/src";
+        $tdir = "$sshdir->{$ENV{'PBPROJ'}}/src";
+    } elsif ($cmt eq "VMs") {
+        $tdir = "$sshdir->{$ENV{'PBPROJ'}}";
     } elsif ($cmt eq "Packages") {
-        $dir = "$sshdir->{$ENV{'PBPROJ'}}/$ddir/$dver";
+        $tdir = "$sshdir->{$ENV{'PBPROJ'}}/$ddir/$dver";
     } else {
         return;
     }
     $src = join(' ',@src);
-    pb_system("ssh -q $mac \"mkdir -p $dir ; cd $dir ; rm -f $src\"","Preparing $dir on $mac");
-    pb_system("scp -p $src $mac:$dir","$cmt delivery in $dir on $mac");
+    pb_system("ssh -q $mac \"mkdir -p $tdir ; cd $tdir ; rm -f $src\"","Preparing $tdir on $mac");
+    pb_system("scp -p -P $sshport $src $mac:$tdir","$cmt delivery in $tdir on $mac");
+    pb_system("ssh -q $mac \"cd $tdir ; if [-f pbscript]; then chmod 755 ./pbscript ; ./pbscript\"","Executing pbscript on $mac");
+    if ($cmt eq "VMs") {
+        pb_system("scp -p -P $sshport $mac:$tdir/.... ...","Package recovery in $tdir from $mac");
+    }
 }
 
@@ -405 +431 @@
     my ($vm,$all) = pb_get_vm();
 
+    # Prepare the script to be executed on the VM
+    # in $ENV{'PBDESTDIR'}/pbscript
+    # Launch the VM
+    # Gather all required files to send them to the VM
+    pb_send2ssh("VMs","vmhost","vmlogin","vmdir","vmport");
+    
     # Send tar files when we do a global generation
     pb_build2ssh() if ($all == 1);
@@ -412 +444 @@
 
 my @pkgs;
+my $defpkgdir = shift;
+my $extpkgdir = shift;
+
+my %defpkgdir = %$defpkgdir;
+my %extpkgdir = %$extpkgdir;
 
 # Get packages list
@@ -418 +455 @@
 } elsif ($ARGV[0] =~ /^all$/) {
     @pkgs = keys %defpkgdir;
-    if (defined %extpkgdir) {
-        my $k = keys %extpkgdir;
-        if (defined $k) {
-            push(@pkgs, keys %extpkgdir);
-        }
-    }
+    push(@pkgs, keys %extpkgdir);
 } else {
     @pkgs = @ARGV;
@@ -443 +475 @@
 # Get VM list
 if ((not defined $ENV{'PBVM'}) || ($ENV{'PBVM'} =~ /^all$/)) {
-    my $ptr = pb_conf_get("vmlist");
+    my ($ptr) = pb_conf_get("vmlist");
     $ENV{'PBVM'} = $ptr->{$ENV{'PBPROJ'}};
     $all = 1;
 }
 @vm = split(/,/,$ENV{'PBVM'});
-print $LOG "VMs: ".join(',',@vm)."\n" if ($debug >= 0);
+print $LOG "VMs: ".join(',',@vm)."\n";
 return(\@vm,$all);
 }