Changeset 2468 in ProjectBuilder

Timestamp:

Jan 20, 2020, 2:12:55 AM (4 years ago)

Author:

Bruno Cornec

Message:

Fix #180 by adding the pb_check_v function

Location:

devel

Files:

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

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

@@ -681 +681 @@
     }
 }
-pb_log(1, "INFO: Adding $repo from config file for $repotype step\n");
+pb_log(1, "INFO: Adding $repo from config file for $repotype step\n") if (defined $repo);
 return(pb_distro_setuprepo_gen($pbos,$repo));
 }

devel/pb/bin/pb

@@ -2694 +2694 @@
                 $origimage = "$tag{$pbstep}";
             }
-            cluck "No image $tag{$pbstep} available in Docker, please create one first\n" if (not defined $found);
+            confess "No image $tag{$pbstep} available in Docker, please create one first\n" if ((not defined $found) && ($pbstep <= 3));
             # Now we use that image to do what is needed
             # use a dockerfile to ease the creation of next images
@@ -3458 +3458 @@
 pb_log(1,"Entering in pb_build2v ($action in $vtype) \n");
 
-# We prepare scripts for all V of this vtype to allow sharing that part
-my ($v,$all) = pb_get2v($vtype);
+my ($v,$all) = ("", 0);
+# Determine on which V to work
+if (defined $ENV{'PBV'}) {
+    @$v = split(/,/,$ENV{'PBV'});
+} else {
+    ($v,$all) = pb_get2v($vtype);
+}
 
 # Send tar files when we do a global generation
@@ -3486 +3491 @@
 my $counter = 0;
 foreach my $v (@$v) {
+    # Check that this VE/VM is in the list of systems for which we build
+    if (($action eq "build") || ($action eq "prep")) {
+        pb_check_v($v,$vtype);
+    }
     $counter++;
     $pbscript{$v} = "$ENV{'PBDESTDIR'}/pb$action-$v";
@@ -3746 +3755 @@
 }
 
+# Return the list of all VMs/VEs/RMs we are working on through the content of v(e|m)list
+# in conf file
+
+sub pb_get_allv {
+
+my $vtype = shift;
+my $vlist = $vtype."list";
+
+my ($ptr) = pb_conf_get($vlist);
+my @v = split(/,/,$ptr->{$ENV{'PBPROJ'}});
+return(\@v);
+}
+
 #
 # Return the list of VMs/VEs/RMs we are working on
 # $all is a flag to know if we return all of them 
-# or only some (if all we publish also tar files in addition to pkgs
+# or only some (if all we publish also tar files in addition to pkgs)
 #
 sub pb_get2v {
@@ -3769 +3791 @@
 return(\@v,$all);
 }
-
 # This function creates a giant script to configure a particular VM/VE/RM, it then copies the 
 # script to the target.
@@ -3803 +3824 @@
 my $counter = 0;
 foreach my $v (@$vm) {
+    # Verify that this V is in our list
+    pb_check_v($v,$vtype);
+    
     # Script generated - should be before the fork - after the %pbscript hash isn't updated correctly
     $pbscript{$v} = "$ENV{'PBDESTDIR'}/setupv-$v";
@@ -4395 +4419 @@
     $pm->start($counter) and next if (defined $pbparallel);
 
-    my $done = 0;
     my $lmsg = "";
     my $lctn = "";
@@ -4408 +4431 @@
         # pb -p pb -m distro-ver-arch newve -i distro:ver
         ($pbforce == 1) ? $lmsg = "Forced" : $lmsg = "not found";
-        pb_log(0,"Docker image $lctn $lmsg, creating it\n");
+        pb_log(0,"INFO: Docker image $lctn $lmsg, creating it\n");
         pb_launchv(undef,"ve",$v,$action,0,$pbforce,undef,undef,$pbimage);
     }
@@ -4417 +4440 @@
     if (($pbforce == 1) || (not defined $found)) {
         ($pbforce == 1) ? $lmsg = "Forced" : $lmsg = "not found";
-        pb_log(0,"Docker image $lctn $lmsg, creating it\n");
+        pb_log(0,"INFO: Docker image $lctn $lmsg, creating it\n");
         # pb -p pb -m distro-ver-arch setupve
+        pb_log(2,"Using savproj: $savproj\n");
         if ($savproj eq "pb") {
-            pb_cms2build("SandBox") if ($action !~ /sbx2/);
-            $done = 1;
+            pb_cms2build("SandBox") if ($action =~ /sbx2/);
             pb_setup2v("ve","SandBox");
         } else {
@@ -4434 +4457 @@
     if (($pbforce == 1) || (not defined $found)) {
         ($pbforce == 1) ? $lmsg = "Forced" : $lmsg = "not found";
-        pb_log(0,"Docker image $lctn $lmsg, creating it\n");
-        # pb -p pb -m distro-ver-arch prepve
-        if ($savproj eq "pb") {
-            pb_cms2build("SandBox") if ($action !~ /sbx2/);
-            $done = 1;
-        }
+        pb_log(0,"INFO: Docker image $lctn $lmsg, creating it\n");
+        # pb -p proj -m distro-ver-arch prepve
         pb_build2v("ve","prep");
     }
-    pb_log(0,"Instantiating a Docker container from $lctn\n");
-    if (($savproj ne "pb") || ($done == 0)) {
-        pb_cms2build("SandBox") if ($action !~ /sbx2/);
-    }
+    pb_log(0,"INFO: Instantiating a Docker container from $lctn\n");
     pb_build2v("ve","build");
     $pm->finish if (defined $pbparallel);
@@ -5509 +5525 @@
 }
 
+sub pb_check_v {
+
+my $v = shift;
+my $vtype = shift;
+
+my ($v2,$all2) = pb_get_allv($vtype);
+pb_log(1,"INFO: velist is:\n");
+pb_log(1,Dumper(@$v2));
+my $foundv = 0;
+foreach my $v3 (@$v2) {
+    pb_log(1,"INFO: looking at **$v3** in $vtype"."list\n");
+    if ($v3 eq $v) {
+        $foundv = 1;
+        last;
+    }
+}
+confess("Building for $v, however it's not part of the $vtype"."list parameter. Aborting") if ($foundv == 0);
+pb_log(1,"INFO: $v is in $vtype"."list\n");
+return;
+}
+
+
 1;