Changeset 1189

Timestamp:

02/15/11 03:48:55 (2 years ago)

Author:

bruno

Message:

• Fix a parallelism issue when building in VMs. This change forces again to update VMs in order to have compatible pb exchnaging info between themselves with a new name of exchange file.

File:

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

devel/pb/bin/pb

@@ -847 +847 @@
         # Get list of distributions for which we need to generate build files if no target
         if (not defined ($pbtarget)) {
-            my @pt = pb_conf_get_if("vmlist","velist");
+            my @pt = pb_conf_get_if("vmlist","velist","rmlist");
             if (defined $pt[0]->{$ENV{'PBPROJ'}}) {
                 $tmpl .= $pt[0]->{$ENV{'PBPROJ'}};
@@ -857 +857 @@
                 }
                 $tmpl .= $pt[1]->{$ENV{'PBPROJ'}} 
+            }
+            if (defined $pt[2]->{$ENV{'PBPROJ'}}) {
+                # The lists needs to be grouped with a ',' separating them
+                if ($tmpl ne "") {
+                    $tmpl .= ",";
+                }
+                $tmpl .= $pt[2]->{$ENV{'PBPROJ'}} 
             }
         }
@@ -905 +912 @@
             $pm = new Parallel::ForkManager($pbparallel) if (defined $pbparallel);
 
+            pb_log(0,"Preparing delivery ...\n");
             foreach my $v (keys %virt) {
                 $pm->start and next if (defined $pbparallel);
@@ -911 +919 @@
                 my $pbos = pb_distro_get_context($v);
                 $pb->{'pbos'} = $pbos;
+                $pb->{'suf'} = $pbos->{'suffix'};
                 pb_log(3,"DEBUG: pb: ".Dumper($pb)."\n");
 
@@ -1452 +1461 @@
 
     # Keep track of what is generated so that we can get them back from VMs/RMs
-    open(KEEP,"> $ENV{'PBBUILDDIR'}/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}") || die "Unable to create $ENV{'PBBUILDDIR'}/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}";
+    open(KEEP,"> $ENV{'PBBUILDDIR'}/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}-$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}") || die "Unable to create $ENV{'PBBUILDDIR'}/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}-$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}";
     print KEEP "$made\n";
     close(KEEP);
@@ -1580 +1589 @@
     } elsif ($cmt eq "Packages") {
         # Get package list from file made during build2pkg
-        open(KEEP,"$ENV{'PBBUILDDIR'}/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}") || die "Unable to read $ENV{'PBBUILDDIR'}/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}";
+        open(KEEP,"$ENV{'PBBUILDDIR'}/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}-$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}") || die "Unable to read $ENV{'PBBUILDDIR'}/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}-$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}";
         $src = <KEEP>;
         chomp($src);
         close(KEEP);
-        $src="$src $ENV{'PBBUILDDIR'}/pbscript";
+        $src="$src $ENV{'PBBUILDDIR'}/pbscript.$$";
     }
     # Remove potential leading spaces (cause problem with basename)
@@ -1649 +1658 @@
 
         # Repository management
-        open(PBS,"> $ENV{'PBBUILDDIR'}/pbscript") || die "Unable to create $ENV{'PBBUILDDIR'}/pbscript";
+        open(PBS,"> $ENV{'PBBUILDDIR'}/pbscript.$$") || die "Unable to create $ENV{'PBBUILDDIR'}/pbscript.$$";
         if ($pbos->{'type'} eq "rpm") {
             # Also make a pbscript to generate yum/urpmi bases
@@ -1813 +1822 @@
         }
         close(PBS);
-        chmod 0755,"$ENV{'PBBUILDDIR'}/pbscript";
+        chmod 0755,"$ENV{'PBBUILDDIR'}/pbscript.$$";
     } else {
         return;
@@ -1883 +1892 @@
     # Use the right script name depending on context
     my $pbscript;
-    if ($cmt =~ /^(V[EM]|RM)/) {
+    if (($cmt =~ /^(V[EM]|RM)/) || ($cmt =~ /Packages/)){
         $pbscript = "pbscript.$$";
     } else {
@@ -1892 +1901 @@
     if ($cmt =~ /^(V[EM]|RM)build/) {
         # Get back info on pkg produced, compute their name and get them from the VM/RM
-        pb_system("$cpcmd $cp2target/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'} $ENV{'PBBUILDDIR'}/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.$$ 2> /dev/null","Get package names in $cp2target");
+        pb_system("$cpcmd $cp2target/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}-$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'} $ENV{'PBBUILDDIR'}/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.$$ 2> /dev/null","Get package names in $cp2target");
         # For VE we need to change the owner manually
         if ($cmt eq "VEbuild") {
@@ -1918 +1927 @@
             }   
 
-            open(KEEP,"> $ENV{'PBBUILDDIR'}/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}") || die "Unable to write $ENV{'PBBUILDDIR'}/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}";
+            open(KEEP,"> $ENV{'PBBUILDDIR'}/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}-$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}") || die "Unable to write $ENV{'PBBUILDDIR'}/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}-$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}";
             foreach my $p (split(/ +/,$src)) {
                 my $j = basename($p);
@@ -1944 +1953 @@
         }
     }
-    unlink("$ENV{'PBDESTDIR'}/pbscript.$$") if ($cmt =~ /^(V[ME]|RM)/);
+    unlink("$ENV{'PBDESTDIR'}/pbscript.$$") if (($cmt =~ /^(V[ME]|RM)/) || ($cmt =~ /Packages/));
 
     pb_log(2,"Before halt, vmexist: $vmexist, vmpid: $vmpid\n");
@@ -2952 +2961 @@
     # Try to restrict security to what is really needed
     if ($vtype =~ /^vm/) {
-        my $sudocmds = pb_get_sudocmds($pbos);
+        my @sudocmds = pb_get_sudocmds($pbos);
         my $hpath = "/sbin";
         # Solaris has halt elsewhere
@@ -2964 +2973 @@
 print PBOUT "$pbac->{$ENV{'PBPROJ'}}   localhost=NOPASSWD:$hpath/halt\n";
 EOF
-        foreach my $c ($sudocmds) {
-            print SCRIPT "print PBOUT \"$pbac->{$ENV{'PBPROJ'}}   localhost=NOPASSWD:$c\n\"";
+        foreach my $c (@sudocmds) {
+            print SCRIPT "print PBOUT \"$pbac->{$ENV{'PBPROJ'}}   localhost=NOPASSWD:$c\n\";";
         }
     } elsif ($vtype =~ /^rm/) {
-        my $sudocmds = pb_get_sudocmds($pbos);
+        my @sudocmds = pb_get_sudocmds($pbos);
         print SCRIPT << "EOF";
 # Build account $pbac->{$ENV{'PBPROJ'}} in RM only needs to setup date and install deps if needed each time
 EOF
-        foreach my $c ($sudocmds) {
-            print SCRIPT "print PBOUT \"$pbac->{$ENV{'PBPROJ'}}   localhost=NOPASSWD:$c\n\"";
+        foreach my $c (@sudocmds) {
+            print SCRIPT "print PBOUT \"$pbac->{$ENV{'PBPROJ'}}   localhost=NOPASSWD:$c\n\";";
         }
     } else {
@@ -3072 +3081 @@
     print SCRIPT << 'EOF';
 pb_system("pb 2>&1 | head -5",undef,"verbose");
+pb_system("pbdistrocheck",undef,"verbose");
 EOF
     if ($vtype eq "ve") {