Changeset 1907 in ProjectBuilder for devel/pb/bin/pb

Timestamp:

Oct 10, 2014, 11:32:12 AM (10 years ago)

Author:

Bruno Cornec

Message:

Fix some default initializations (

undef e.g.)

• VE.pm doesn't need to have pbstep (use pbforce simply)
• Fix sbx2setupve in a docker context
• Add entries for prepve|vm|rm
• Move sandbox management into send2target so that all files to process are managed here

File:

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

devel/pb/bin/pb

@@ -252 +252 @@
 RM means Remote Machine, and could be a physical or Virtual one.
 This is one buildfarm integration for pb.
+
+=item B<prepvm>
+
+Prepare the VMs to have all requirements to build the project
+
+=item B<prepve>
+
+Prepare the VEs to have all requirements to build the project
+
+=item B<preprm>
+
+Prepare the RMs to have all requirements to build the project
 
 =item B<sbx2vm>
@@ -855 +867 @@
 } elsif ($action =~ /^build2vm$/) {
     pb_build2v("vm","build");
+} elsif ($action =~ /^preprm$/) {
+    pb_build2v("rm","prep");
+} elsif ($action =~ /^prepve$/) {
+    pb_build2v("ve","prep");
+} elsif ($action =~ /^prepvm$/) {
+    pb_build2v("vm","prep");
 } elsif ($action =~ /^cms2rm$/) {
     pb_cms2build("CMS");
@@ -1000 +1018 @@
 sub pb_cms2build {
 
-    my $param = shift || undef;
-    my $web = shift || undef;
+    my $param = shift;
+    my $web = shift;
 
     my $pkg;
@@ -1528 +1546 @@
     }
     pb_log(0,"INFO: ------ Finished preparing build environment ------\n");
-    open(PKG,">> $ENV{'PBDESTDIR'}/$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.pb") || die "Unable to append to $ENV{'PBDESTDIR'}/$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.pb";
-    print PKG "pbstep $pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'} = 2\n";
-    close(PKG);
 }
 
@@ -1541 +1556 @@
     my $pbos = pb_distro_get_context();
 
-    # Check whether the preparation phase has already been done or not
-    my ($pbstep) = pb_distro_get_param($pbos,pb_conf_read_if("$ENV{'PBDESTDIR'}/$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.pb","pbstep"));
-    pb_build2prep() if ((not defined $pbstep) || ($pbstep < 2));
-    
     # Get list of packages to build
     my $ptr = pb_get_pkg();
@@ -1934 +1945 @@
     print KEEP "$made\n";
     close(KEEP);
-    open(PKG,">> $ENV{'PBDESTDIR'}/$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.pb") || die "Unable to append to $ENV{'PBDESTDIR'}/$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.pb";
-    print PKG "pbstep $pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'} = 3\n";
-    close(PKG);
     pb_distro_installdeps(undef,$pbos,$ret) if ($do_install);
-}
-
-sub create_solaris_prototype {
-
-    my $uidgid = "bin bin";
-    my $pkgdestdir = $ENV{'PBSOLDESTDIR'};
-
-    return if ($_ =~ /^$pkgdestdir$/);
-    if (-d $_) {
-        my $n = $File::Find::name;
-        $n =~ s~$pkgdestdir/~~;
-        print PROTO "d none $n 0755 $uidgid\n";
-    } elsif (-x $_) {
-        my $n = $File::Find::name;
-        $n =~ s~$pkgdestdir/~~;
-        print PROTO "f none $n 0755 $uidgid\n";
-    } elsif (-f $_) {
-        my $n = $File::Find::name;
-        $n =~ s~$pkgdestdir/~~;
-        print PROTO "f none $n 0644 $uidgid\n";
-    }
 }
 
@@ -1975 +1962 @@
 
     my $cmt = shift;
-    my $pbscript = shift || undef;
-    my $v = shift || undef;
-    my $vexist = shift || 0;            # 0 is FALSE
-    my $vpid = shift || 0;              # 0 is FALSE
-    my $snapme = shift || 0;            # 0 is FALSE
-    my $pbstep = shift || 3;            # 3 is usage of container
-
+    my $pbscript = shift;
+    my $v = shift;
+    my $vexist = shift;         # 0 is FALSE
+    my $vpid = shift;           # 0 is FALSE
+    my $snapme = shift;         # 0 is FALSE
+    my $pbstep = shift;         # 3 is usage of container
+
+    $vexist = 0 if (not defined $vexist);
+    $vpid = 0 if (not defined $vpid);
+    $snapme = 0 if (not defined $snapme);
+    $pbstep = 3 if (not defined $pbstep);
     pb_log(2,"DEBUG: pb_send2target($cmt,".Dumper($v).",$vexist,$vpid)\n");
     my $host = "sshhost";
@@ -2085 +2076 @@
     }
 
-    if ($cmt =~ /(V[EM]|RM)build/) {
+    if ($cmt =~ /(V[EM]|RM)(build|prep)/) {
         $src="$src $ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb $ENV{'PBDESTDIR'}/$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.pb $ENV{'PBETC'} $ENV{'PBDESTDIR'}/pbrc $pbscript{$v}";
     } elsif ($cmt =~ /(V[EM]|RM)Script/) {
@@ -2161 +2152 @@
     } elsif ($cmt eq "CPAN") {
         $tdir = "$remdir";
-    } elsif ($cmt =~ /(V[EM]|RM)(build|test)/) {
+    } elsif ($cmt =~ /(V[EM]|RM)(build|test|prep)/) {
         $tdir = $remdir."/$ENV{'PBPROJ'}/delivery";
         $bdir = $remdir."/$ENV{'PBPROJ'}/build";
@@ -2423 +2414 @@
     if ($cmt =~ /^VE/) {
         $tp = pb_path_expand($vepath->{$ENV{'PBPROJ'}});
+        $vetype = pb_ve_get_type($vetype);
         if ($vetype eq "docker") {
             $tpdir = "/";
@@ -2428 +2420 @@
             $tpdir = pb_path_expand("$tp/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}");
         }
-        $vetype = pb_ve_get_type($vetype);
         my $arch = pb_get_arch();
         if ($vetype eq "chroot") {
@@ -2561 +2552 @@
         $logres = "> ";
     }
+
+    if ($cmt =~ /SandBox/) {
+        # Install from sandbox mean using the result of the just passed sbx2build command
+        # Get content saved in cms2build
+        my ($pkg) = pb_conf_read("$ENV{'PBDESTDIR'}/$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.pb","pbpkg");
+        my $pbextdir = pb_get_extdir();
+        confess "Unable to get package list" if (not defined $pkg);
+
+        # We consider 2 specific packages
+        my $vertag1 = $pkg->{"ProjectBuilder"};
+        my $vertag2 = $pkg->{"project-builder"};
+        # get the version of the current package - maybe different
+        pb_log(2,"Vertag1: $vertag1\n");
+        pb_log(2,"Vertag2: $vertag2\n");
+        my ($pbver1,$tmp1) = split(/-/,$vertag1);
+        my ($pbver2,$tmp2) = split(/-/,$vertag2);
+        if ($cmt =~ /VE/) {
+            # Copy inside the VE
+            if ($vetype ne "docker") {
+                copy("$ENV{'PBDESTDIR'}/ProjectBuilder-$pbver1$pbextdir.tar.gz","$tpdir/tmp");
+                copy("$ENV{'PBDESTDIR'}/project-builder-$pbver2$pbextdir.tar.gz","$tpdir/tmp");
+            } else {
+                copy("$ENV{'PBDESTDIR'}/ProjectBuilder-$pbver1$pbextdir.tar.gz","$context");
+                copy("$ENV{'PBDESTDIR'}/project-builder-$pbver2$pbextdir.tar.gz","$context");
+                print DOCKER "COPY ProjectBuilder-$pbver1$pbextdir.tar.gz /tmp/\n";
+                print DOCKER "COPY project-builder-$pbver2$pbextdir.tar.gz /tmp/\n";
+            }
+        } 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.");
+        }
+    }
+            
     # For docker everything is done in the Dockerfile
     if (($cmt =~ /^VE/) && ($vetype eq "docker") && ($pbstep < 3)) {
@@ -2580 +2603 @@
             pb_system("$shcmd \"sudo chown -R $mac $tdir\"","Adapt owner in $tdir to $mac");
         } else {
-            print DOCKER "RUN sed -i '/requiretty/d' /etc/sudoers" if ($pbstep == 1);
+            print DOCKER "RUN sed -i '/requiretty/d' /etc/sudoers\n" if ($pbstep == 1);
         }
     }
@@ -2615 +2638 @@
     }
     # this is where we lanch the execution
-    pb_system("$shcmd","Executing pbscript on $cptarget if needed",$cmdverb);
+    my $ret = pb_system("$shcmd","Executing pbscript on $cptarget if needed",$cmdverb);
 
     if ($cmt =~ /^(V[EM]|RM)build/) {
@@ -2700 +2723 @@
     }
     if (($cmt =~ /^VE/) && ($snapme != 0)) {
-        pb_ve_snap($pbos,$tp);
         if ($vetype eq "docker") {
             foreach my $f (split(/ +/,$src)) {
                 unlink("$context/$f");
             }
+        } else {
+            pb_ve_snap($pbos,$tp);
         }
     }
@@ -2714 +2738 @@
 my $vtype=shift;
 my $pbstep=shift;   # Which step are we in (0: create, 1: setup pb, 2: prep pbproj, 3: use to build)
-my $pbforce=shift || 0; # Force stop of VM. Default not.
-my $snapme=shift || 0;  # Do we have to create a snapshot. Default not.
-my $pbimage=shift || undef; # Which image to use to start the VM/VE
-my $vm;
-my $all;
+my $pbforce=shift;  # Force stop of VM. Default not.
+my $snapme=shift;   # Do we have to create a snapshot. Default not.
+my $pbimage=shift;  # Which image to use to start the VM/VE
+
+$pbforce = 0 if (not defined $pbforce);
+$snapme = 0 if (not defined $snapme);
 
 pb_log(2,"DEBUG: pb_script2v($vtype,$pbstep,$pbforce,$snapme)\n");
@@ -2729 +2754 @@
 my $pbscript=shift;
 my $vtype = shift;
-my $action = shift;             # It an action is defined then use send2target
+my $action = shift;         # It an action is defined then use send2target
 my $pbstep=shift;           # Which step are we in (0: create, 1: setup, 2: build 3: use)
-my $pbforce=shift || 0;         # Force stop of VM. Default not.
-my $snapme = shift || 0;        # By default do not snap a VM/VE/RM
-my $usesnap = shift || 1;       # By default study the usage of the snapshot feature of VM/VE/RM    
-my $pbimage=shift || undef;     # Which image to use to start the VM/VE
+my $pbforce=shift;          # Force stop of VM. Default not.
+my $snapme = shift;         # By default do not snap a VM/VE/RM
+my $usesnap = shift;        # By default study the usage of the snapshot feature of VM/VE/RM    
+my $pbimage=shift;          # Which image to use to start the VM/VE
 my $vm;
 my $all;
+
+$pbforce = 0 if (not defined $pbforce);
+$snapme = 0 if (not defined $snapme);
+$usesnap = 1 if (not defined $usesnap);
 
 # Adapt // mode to memory size
@@ -2777 +2806 @@
     my $pbscript = $pbscript->{$v} if (defined $pbscript->{$v});
     $pbscript = $pbscript->{'default'} if (not defined $pbscript);
-    confess "No script defined so unable to launch it in $v" if (not defined $pbscript);
     ($vexist,$vpid) = pb_launchv($pbscript,$vtype,$v,$action,$pbstep,$pbforce,$snapme,$pbsnap,$pbimage);
     
@@ -2795 +2823 @@
 my $pbscript=shift;
 my $vtype = shift;
-my $v = shift;                  # Only 1 VM/VE/RM treated here
-my $action = shift;             # It an action is defined then use send2target
+my $v = shift;              # Only 1 VM/VE/RM treated here
+my $action = shift;         # It an action is defined then use send2target
 my $pbstep=shift;           # Which step are we in (0: create, 1: setup, 2: build 3: use)
-my $pbforce=shift || 0;         # Force stop of VM. Default not.
-my $snapme = shift || 0;        # By default do not snap a VM/VE/RM
-my $usesnap = shift || 1;       # By default study the usage of the snapshot feature of VM/VE/RM    
-my $pbimage=shift || undef;     # Which image to use to start the VM/VE
+my $pbforce=shift;          # Force stop of VM. Default not.
+my $snapme = shift;         # By default do not snap a VM/VE/RM
+my $usesnap = shift;            # By default study the usage of the snapshot feature of VM/VE/RM    
+my $pbimage=shift;          # Which image to use to start the VM/VE
 my $vexist = undef;
 my $vpid = undef;
+
+$pbforce = 0 if (not defined $pbforce);
+$snapme = 0 if (not defined $snapme);
+$usesnap = 1 if (not defined $usesnap);
 
 # Check that v exists
@@ -2813 +2845 @@
 }
 
-pb_log(2,"DEBUG: pb_launchv(script,vtype,v,step,force,snapme,usesnap: $pbscript,$vtype,$v,$pbstep,$pbforce,$snapme,$usesnap)\n");
+pb_log(2,"DEBUG: pb_launchv(vtype,v,step,force,snapme,usesnap: $vtype,$v,$pbstep,$pbforce,$snapme,$usesnap)\n");
 pb_log(2,"DEBUG: pb_launchv(pbimage: $pbimage)\n") if (defined $pbimage);
+pb_log(2,"DEBUG: pb_launchv(pbimage: $pbscript)\n") if (defined $pbscript);
 pb_log(2,"DEBUG: pb_launchv(action: $action)\n") if (defined $action);
 # Keep only the first VM in case many were given
@@ -2967 +3000 @@
     # Force the creation of the VE and no snapshot usable
     $vetype = pb_ve_get_type($vetype);
-    pb_ve_launch($v,$pbscript,$pbforce,$pbstep,$usesnap,$vetype,$pbimage);
+    pb_ve_launch($v,$pbstep,$usesnap,$vetype,$pbimage);
     $vexist = 0;
     $vpid = 0;
 } else {
-    # RM here
-    # Get distro context
-    my $pbos = pb_distro_get_context($v);
-
     # Get RM context
     my ($ptr,$rmpath) = pb_conf_get("rmtype","rmpath");
@@ -3034 +3063 @@
 
 my $vtype = shift;
-my $action = shift || "build";   #build, test or prep
-my $pbforce=shift || 0;         # Force stop of VM. Default not.
+my $action = shift;     #build, test or prep
+my $pbforce=shift;      # Force stop of VM. Default not.
+
+$action = "build" if (not defined $action);
+$pbforce = 0 if (not defined $pbforce);
 
 my $pbstep;
@@ -3101 +3133 @@
     print SCRIPT "export PBPROJ=$ENV{'PBPROJ'}\n";
 
-    if ($action eq "build") {
+    if (($action eq "build") || ($action eq "prep")) {
         print SCRIPT "# Preparation for pb\n";
         print SCRIPT "rm -f \$HOME/.pbrc\n";
@@ -3109 +3141 @@
 
     # VE needs a good /proc, tolerate one being potentially left around after a failure
+    $vetype = pb_ve_get_type($vetype);
     if (($vtype eq "ve") && ($vetype ne "docker")) {
         print SCRIPT "[ -d /proc/1 ] || sudo /bin/mount -t proc /proc /proc\n";
@@ -3358 +3391 @@
 
 my $vtype = shift;
-my $sbx = shift || undef;
+my $sbx = shift;
 my $pbstep = 1;
 
@@ -3463 +3496 @@
         # once this is done, we can do what we need on the VM/RM remotely
     } elsif ($vtype eq "ve") {
+        $vetype = pb_ve_get_type($vetype);
         if ($vetype ne "docker") {
             print SCRIPT << "EOF";
@@ -3727 +3761 @@
             my ($pbver1,$tmp1) = split(/-/,$vertag1);
             my ($pbver2,$tmp2) = split(/-/,$vertag2);
-            # Copy inside the VE
-            if ($vtype eq "ve") {
-                my ($vepath) = pb_conf_get("vepath");
-                copy("$ENV{'PBDESTDIR'}/ProjectBuilder-$pbver1$pbextdir.tar.gz","$vepath->{$ENV{'PBPROJ'}}/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}/tmp");
-                copy("$ENV{'PBDESTDIR'}/project-builder-$pbver2$pbextdir.tar.gz","$vepath->{$ENV{'PBPROJ'}}/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}/tmp");
-            } else {
-                pb_system("scp -i $keyfile -p -o UserKnownHostsFile=/dev/null -P $nport $ENV{'PBDESTDIR'}/ProjectBuilder-$pbver1$pbextdir.tar.gz $ENV{'PBDESTDIR'}/project-builder-$pbver2$pbextdir.tar.gz root\@$vmhost->{$ENV{'PBPROJ'}}:/tmp","Copying local project files to $vtype.");
-            }
             $cmdget = "mv /tmp/ProjectBuilder-$pbver1$pbextdir.tar.gz ProjectBuilder-latest.tar.gz ; mv /tmp/project-builder-$pbver2$pbextdir.tar.gz project-builder-latest.tar.gz";
         } else {
@@ -3851 +3877 @@
 # Launch the VM/VE/RM
 pb_log(2,"DEBUG: before parallel launch, pbscript hash is:".Dumper(%pbscript)."\n");
-pb_parallel_launchv(\%pbscript,$vtype,uc($vtype)."Script",$pbstep,$pbforce);
+pb_parallel_launchv(\%pbscript,$vtype,uc($vtype)."Script".$sbx,$pbstep,$pbforce);
 return;
 }
@@ -3859 +3885 @@
 
 my $vtype = shift;
-my $pbstep = 3;
+my $pbstep = 2;
 
 my ($vm,$all) = pb_get2v($vtype);
@@ -3923 +3949 @@
 EOF
     # VE needs a good /proc
+    $vetype = pb_ve_get_type($vetype);
     if (($vtype eq "ve") && ($vetype ne "docker")) {
         print SCRIPT "sudo /bin/mount -t proc /proc /proc\n";
@@ -4760 +4787 @@
 }   
 
-sub pb_get_extdir () {
+sub pb_get_extdir {
 
     # the pbrc file should contain it and whatever the key, we take it
@@ -4776 +4803 @@
 }
 
+# Unused now
+sub pb_keep_step {
+
+my $pbos = shift;
+my $pbstep = shift;
+
+$pbstep = 3 if (not defined $pbstep);
+
+my %h;
+my $h = \%h;
+$h = pb_conf_cache("$ENV{'PBDESTDIR'}/$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.pb",$h);
+$h->{'pbstep'}->{"$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}"} = $pbstep;
+pb_conf_write("$ENV{'PBDESTDIR'}/$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.pb",$h);
+}
+
+sub create_solaris_prototype {
+
+    my $uidgid = "bin bin";
+    my $pkgdestdir = $ENV{'PBSOLDESTDIR'};
+
+    return if ($_ =~ /^$pkgdestdir$/);
+    if (-d $_) {
+        my $n = $File::Find::name;
+        $n =~ s~$pkgdestdir/~~;
+        print PROTO "d none $n 0755 $uidgid\n";
+    } elsif (-x $_) {
+        my $n = $File::Find::name;
+        $n =~ s~$pkgdestdir/~~;
+        print PROTO "f none $n 0755 $uidgid\n";
+    } elsif (-f $_) {
+        my $n = $File::Find::name;
+        $n =~ s~$pkgdestdir/~~;
+        print PROTO "f none $n 0644 $uidgid\n";
+    }
+}
+
+
 1;