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

Timestamp:

Jan 13, 2011, 1:18:37 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Adds a global variable REVISION for version management
• Do not return in pb_send2target if pb file not available in order to shutdown VM in all cases
• Code and test sbx2setupvm
• setup_v now needs a fake pb_version_init fct added at the end of the script
• Fix pbdistrocheck install comand printing
• Fix mandralinux old distro build in pb.conf (Note only non symlink release files are important)

File:

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

devel/pb/bin/pb

@@ -1751 +1751 @@
             pb_system("sudo chown $UID $ENV{'PBBUILDDIR'}/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.$$","Adapt owner in $tdir to $UID");
         }
-        # return here to avoid breaking the load on VMs/VEs in case of a bad one
         if (not -f "$ENV{'PBBUILDDIR'}/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.$$") {
             pb_log(0,"Problem with VM $v on $ENV{'PBBUILDDIR'}/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.$$");
-            return;
-        }
-        open(KEEP,"$ENV{'PBBUILDDIR'}/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.$$") || die "Unable to read $ENV{'PBBUILDDIR'}/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.$$";
-        my $src = <KEEP>;
-        chomp($src);
-        close(KEEP);
-        unlink("$ENV{'PBBUILDDIR'}/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.$$");
-
-        $src =~ s/^ *//;
-        pb_mkdir_p("$ENV{'PBBUILDDIR'}/$odir/$over/$oarch");
-        # Change pgben to make the next send2target happy
-        my $made = "";
-
-        # For VM we don't want shell expansion to hapen locally but remotely
-        my $delim = '\'';
-        if ($cmt =~ /^VEbuild/) {
-            # For VE we need to support shell expansion locally
-            $delim = "";
-        }   
-
-        open(KEEP,"> $ENV{'PBBUILDDIR'}/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}") || die "Unable to write $ENV{'PBBUILDDIR'}/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}";
-        foreach my $p (split(/ +/,$src)) {
-            my $j = basename($p);
-            pb_system("$cpcmd $cp2target/$delim$p$delim $ENV{'PBBUILDDIR'}/$odir/$over/$oarch 2> /dev/null","Recovery of package $j in $ENV{'PBBUILDDIR'}/$odir/$over/$oarch");
-            $made="$made $odir/$over/$oarch/$j"; # if (($dtype ne "rpm") || ($j !~ /.src.rpm$/));
-        }
-        print KEEP "$made\n";
-        close(KEEP);
-        pb_system("$shcmd \"rm -rf $tdir $bdir\"","$cmt cleanup");
-
-        # Sign packages locally
-        if ($dtype eq "rpm") {
+        } else {
+            open(KEEP,"$ENV{'PBBUILDDIR'}/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.$$") || die "Unable to read $ENV{'PBBUILDDIR'}/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.$$";
+            my $src = <KEEP>;
+            chomp($src);
+            close(KEEP);
+            unlink("$ENV{'PBBUILDDIR'}/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.$$");
+
+            $src =~ s/^ *//;
+            pb_mkdir_p("$ENV{'PBBUILDDIR'}/$odir/$over/$oarch");
+            # Change pgben to make the next send2target happy
+            my $made = "";
+    
+            # For VM we don't want shell expansion to hapen locally but remotely
+            my $delim = '\'';
+            if ($cmt =~ /^VEbuild/) {
+                # For VE we need to support shell expansion locally
+                $delim = "";
+            }   
+
+            open(KEEP,"> $ENV{'PBBUILDDIR'}/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}") || die "Unable to write $ENV{'PBBUILDDIR'}/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}";
+            foreach my $p (split(/ +/,$src)) {
+                my $j = basename($p);
+                pb_system("$cpcmd $cp2target/$delim$p$delim $ENV{'PBBUILDDIR'}/$odir/$over/$oarch 2> /dev/null","Recovery of package $j in $ENV{'PBBUILDDIR'}/$odir/$over/$oarch");
+                $made="$made $odir/$over/$oarch/$j"; # if (($dtype ne "rpm") || ($j !~ /.src.rpm$/));
+            }
+            print KEEP "$made\n";
+            close(KEEP);
+            pb_system("$shcmd \"rm -rf $tdir $bdir\"","$cmt cleanup");
+
+            # Sign packages locally
+            if ($dtype eq "rpm") {
                 #pb_system("rpm --addsign --define \"_signature gpg\" --define \"_gpg_name $ENV{'PBPACKAGER'}\" --define \"__gpg_sign_cmd /usr/bin/gpg --batch --no-verbose --no-armor --no-tty --no-secmem-warning -sbo %{__signature_filename} %{__plaintext_filename} --use-agent\" $made","Signing RPM packages packages");
-        } elsif ($dtype eq "deb") {
+            } elsif ($dtype eq "deb") {
                 #pb_system("debsign $made","Signing DEB packages");
-        } else {
-            pb_log(0,"I don't know yet how to sign packages for type $dtype.\nPlease give feedback to dev team\n");
-        }
-
-        # We want to send them to the ssh account so overwrite what has been done before
-        undef $pbaccount;
-        pb_log(2,"Before sending pkgs, vmexist: $vmexist, vmpid: $vmpid\n");
-        pb_send2target("Packages",$odir."-".$over."-".$oarch,$vmexist,$vmpid);
-        pb_rm_rf("$ENV{'PBBUILDDIR'}/$odir/$over/$oarch");
+            } else {
+                pb_log(0,"I don't know yet how to sign packages for type $dtype.\nPlease give feedback to dev team\n");
+            }
+
+            # We want to send them to the ssh account so overwrite what has been done before
+            undef $pbaccount;
+            pb_log(2,"Before sending pkgs, vmexist: $vmexist, vmpid: $vmpid\n");
+            pb_send2target("Packages",$odir."-".$over."-".$oarch,$vmexist,$vmpid);
+            pb_rm_rf("$ENV{'PBBUILDDIR'}/$odir/$over/$oarch");
+        }
     }
     unlink("$ENV{'PBDESTDIR'}/pbscript.$$") if ($cmt =~ /^V[ME]/);
@@ -2584 +2583 @@
 # They are appended at the end.
 
+# Define mandatory global vars
 our $pbdebug;
 our $pbLOG;
@@ -2597 +2597 @@
     ($vmexist,$vmpid) = pb_launchv($vtype,$v,0,0,0);
 
+    my $keyfile;
+    my $nport;
+    my $vmhost;
+
     if ($vtype eq "vm") {
         # Prepare the key to be used and transfered remotely
-        my $keyfile = pb_ssh_get(1);
+        $keyfile = pb_ssh_get(1);
         
-        my ($vmhost,$vmport,$vmntp) = pb_conf_get("vmhost","vmport","vmntp");
-        my $nport = pb_get_port($vmport->{$ENV{'PBPROJ'}});
+        my ($vmport,$vmntp);
+        ($vmhost,$vmport,$vmntp) = pb_conf_get("vmhost","vmport","vmntp");
+        $nport = pb_get_port($vmport->{$ENV{'PBPROJ'}});
     
         # Skip that VM if something went wrong
@@ -2837 +2842 @@
             my ($pkg) = pb_conf_read("$ENV{'PBDESTDIR'}/$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.pb","pbpkg");
             die "Unable to get package list" if (not defined $pkg);
-            my ($vepath) = pb_conf_get("vepath");
 
             # We consider 2 specific packages
@@ -2845 +2849 @@
             my ($pbver1,$tmp1) = split(/-/,$vertag1);
             my ($pbver2,$tmp2) = split(/-/,$vertag2);
-            # Copy inside the VM
-            copy("$ENV{'PBDESTDIR'}/ProjectBuilder-$pbver1.tar.gz","$vepath->{$ENV{'PBPROJ'}}/$ddir/$dver/$darch/tmp");
-            copy("$ENV{'PBDESTDIR'}/project-builder-$pbver2.tar.gz","$vepath->{$ENV{'PBPROJ'}}/$ddir/$dver/$darch/tmp");
+            # Copy inside the VE
+            if ($vtype eq "ve") {
+                my ($vepath) = pb_conf_get("vepath");
+                copy("$ENV{'PBDESTDIR'}/ProjectBuilder-$pbver1.tar.gz","$vepath->{$ENV{'PBPROJ'}}/$ddir/$dver/$darch/tmp");
+                copy("$ENV{'PBDESTDIR'}/project-builder-$pbver2.tar.gz","$vepath->{$ENV{'PBPROJ'}}/$ddir/$dver/$darch/tmp");
+            } else {
+                pb_system("scp -i $keyfile -p -o UserKnownHostsFile=/dev/null -P $nport $ENV{'PBDESTDIR'}/ProjectBuilder-$pbver1.tar.gz $ENV{'PBDESTDIR'}/project-builder-$pbver2.tar.gz root\@$vmhost->{$ENV{'PBPROJ'}}:/tmp","Copying local project files to $vtype.");
+            }
             $cmdget = "mv /tmp/ProjectBuilder-$pbver1.tar.gz ProjectBuilder-latest.tar.gz ; mv /tmp/project-builder-$pbver2.tar.gz project-builder-latest.tar.gz";
         } else {
@@ -2904 +2913 @@
     }
 
-    # Adds pb_distro_init and all functions needed from ProjectBuilder::Distribution and Base
+    # Adds pb_distro_init and all functions needed from ProjectBuilder::Distribution, Conf and Base
     foreach my $d (@INC) {
         my @f = ("$d/ProjectBuilder/Base.pm","$d/ProjectBuilder/Distribution.pm","$d/ProjectBuilder/Conf.pm");
@@ -2921 +2930 @@
         }
     }
+    # Use a fake pb_version_init version here
+    print SCRIPT << "EOF";
+sub pb_version_init {
+
+return("$projectbuilderver","$projectbuilderrev");
+}
+1;
+EOF
     close(SCRIPT);
     chmod 0755,"$pbscript";