Changeset 1216 in ProjectBuilder for devel/pb

Timestamp:

Feb 24, 2011, 1:51:30 AM (14 years ago)

Author:

Bruno Cornec

Message:

• rmntpcmd, vmhost, vmmem, vmntpcmd and vmsize have OS keys and not project keys. Fixed in doc and code.
• Document [web]sshdir|port|login|host
• pb_date2v needs the pbos as param to deal with *ntpcmd correctly. $v param removed as a consequence.

File:

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

devel/pb/bin/pb

@@ -1617 +1617 @@
         ($vtmout) = pb_conf_get($tmout);
     }
-    my $sshmachine = $sshhost->{$ENV{'PBPROJ'}};
-    if ($cmt =~ /^RM/) {
-        # In that case our real host is in the rmhost with the OS as key, not project as above
-        $sshmachine = pb_distro_get_param($pbos,$sshhost);
-    }
-    pb_log(2,"ssh: ".Dumper(($sshhost,$sshlogin,$sshdir,$sshport,$vtmout,$vepath,$rbsconf))."\n");
+    my $remhost = $sshhost->{$ENV{'PBPROJ'}};
+    my $remdir = $sshdir->{$ENV{'PBPROJ'}};
+    if ($cmt =~ /^V[EM]|RM/) {
+        # In that case our real host is in the xxhost with the OS as key, not project as above
+        $remhost = pb_distro_get_param($pbos,$sshhost);
+    }
+    pb_log(2,"ssh: ".Dumper(($remhost,$sshlogin,$remdir,$sshport,$vtmout,$vepath,$rbsconf))."\n");
 
     my $mac;
     if ($cmt !~ /^VE/) {
-        $mac = "$sshlogin->{$ENV{'PBPROJ'}}\@$sshmachine";
+        $mac = "$sshlogin->{$ENV{'PBPROJ'}}\@$remhost";
         # Overwrite account value if passed as parameter
-        $mac = "$pbaccount\@$sshmachine" if (defined $pbaccount);
+        $mac = "$pbaccount\@$remhost" if (defined $pbaccount);
         pb_log(2, "DEBUG: pbaccount: $pbaccount => mac: $mac\n") if (defined $pbaccount);
     } else {
@@ -1640 +1641 @@
     my $bdir;
     if (($cmt eq "Sources") || ($cmt =~ /(V[EM]|RM)Script/)) {
-        $tdir = "$sshdir->{$ENV{'PBPROJ'}}/$delivery->{$ENV{'PBPROJ'}}/src";
+        $tdir = "$remdir/$delivery->{$ENV{'PBPROJ'}}/src";
     } elsif ($cmt =~ /(V[EM]|RM)(build|test)/) {
-        $tdir = $sshdir->{$ENV{'PBPROJ'}}."/$ENV{'PBPROJ'}/delivery";
-        $bdir = $sshdir->{$ENV{'PBPROJ'}}."/$ENV{'PBPROJ'}/build";
+        $tdir = $remdir."/$ENV{'PBPROJ'}/delivery";
+        $bdir = $remdir."/$ENV{'PBPROJ'}/build";
         # Remove a potential $ENV{'HOME'} as bdir should be relative to pb's home
         $bdir =~ s|\$ENV.+\}/||;
     } elsif ($cmt eq "Announce") {
-        $tdir = "$sshdir->{$ENV{'PBPROJ'}}/$delivery->{$ENV{'PBPROJ'}}";
+        $tdir = "$remdir/$delivery->{$ENV{'PBPROJ'}}";
     } elsif ($cmt eq "Web") {
-        $tdir = "$sshdir->{$ENV{'PBPROJ'}}/$delivery->{$ENV{'PBPROJ'}}";
+        $tdir = "$remdir/$delivery->{$ENV{'PBPROJ'}}";
     } elsif ($cmt eq "Packages") {
         if (($pbos->{'type'} eq "rpm") || ($pbos->{'type'} eq "pkg") || ($pbos->{'type'} eq "hpux") || ($pbos->{'type'} eq "tgz")) {
             # put packages under an arch subdir
-            $tdir = "$sshdir->{$ENV{'PBPROJ'}}/$delivery->{$ENV{'PBPROJ'}}/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}";
+            $tdir = "$remdir/$delivery->{$ENV{'PBPROJ'}}/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}";
         } elsif (($pbos->{'type'} eq "deb") || ($pbos->{'type'} eq "ebuild")) {
             # No need for an arch subdir
-            $tdir = "$sshdir->{$ENV{'PBPROJ'}}/$delivery->{$ENV{'PBPROJ'}}/$pbos->{'name'}/$pbos->{'version'}";
+            $tdir = "$remdir/$delivery->{$ENV{'PBPROJ'}}/$pbos->{'name'}/$pbos->{'version'}";
         } else {
             die "Please teach the dev team where to deliver ($pbos->{'type'} type of packages\n";
@@ -1662 +1663 @@
 
         my $repodir = $tdir;
-        $repodir =~ s|^$sshdir->{$ENV{'PBPROJ'}}/||;
+        $repodir =~ s|^$remdir/||;
 
         my ($pbrepo) = pb_conf_get("pbrepo");
@@ -1845 +1846 @@
     my $tm = undef;
     if ($cmt =~ /^(V|R)M/) {
-        $tm = $vtmout->{$ENV{'PBPROJ'}};
+        $tm = $vtmout->{$v};
     }
 
@@ -2168 +2169 @@
                 if (($vmtype eq "qemu") || ($vmtype eq "xen") || ($vmtype eq "kvm")) {
                     my $command = pb_check_req("qemu-img",0);
-                    pb_system("$command create -f qcow2 $vmm $vmsize->{$ENV{'PBPROJ'}}","Creating the QEMU VM");
+                    pb_system("$command create -f qcow2 $vmm $vmsize->{$v}","Creating the QEMU VM");
                 } elsif ($vmtype eq "vmware") {
                 } else {
@@ -2388 +2389 @@
 
 my $vtype = shift;
-my $v = shift;
+my $pbos = shift;
 
 my ($ntp) = pb_conf_get_if($vtype."ntp");
@@ -2395 +2396 @@
 
 if (defined $vntp) {
-    my ($ntpcmd) = pb_conf_get($vtype."ntpcmd");
+    my ($ntpcmd) = pb_distro_get_param($pbos,pb_conf_get($vtype."ntpcmd"));
     my $vntpcmd;
-    if (defined $ntpcmd->{$v}) {
-        $vntpcmd = $ntpcmd->{$v};
+    if (defined $ntpcmd->{"$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}"}) {
+        $vntpcmd = $ntpcmd->{"$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}"};
     } elsif (defined $ntpcmd->{$ENV{'PBPROJ'}}) {
         $vntpcmd = $ntpcmd->{$ENV{'PBPROJ'}};
@@ -2482 +2483 @@
     }
 
-    my $ntpline = pb_date2v($vtype,$v);
+    # Get distro context
+    my $pbos = pb_distro_get_context($v);
+    
+    my $ntpline = pb_date2v($vtype,$pbos);
     print SCRIPT "# Time sync\n";
     print SCRIPT "echo 'setting up date with '";
@@ -2726 +2730 @@
     $pm->start($counter) and next if (defined $pbparallel);
 
-    # Deal with date sync.
-    my $ntpline = pb_date2v($vtype,$v);
-
     # Get distro context
     my $pbos = pb_distro_get_context($v);
     
+    # Deal with date sync.
+    my $ntpline = pb_date2v($vtype,$pbos);
+
     # Name of the account to deal with for VM/VE/RM
     # Do not use the one passed potentially with -a