Changeset 1176 in ProjectBuilder for devel/pb

Timestamp:

Feb 7, 2011, 2:24:11 PM (14 years ago)

Author:

Bruno Cornec

Message:

r4160@eelzbach2: bruno | 2011-02-06 13:30:39 +0100

• Adds support for Remote Machines (RM). Not tested yet.

Location:

devel/pb

Files:

• bin/pb (modified) (70 diffs)
• lib/ProjectBuilder/CMS.pm (modified) (2 diffs)
• lib/ProjectBuilder/Env.pm (modified) (3 diffs)

devel/pb/bin/pb

@@ -13 +13 @@
 
 # The modules mentioned here are required by pb when used both 
-# locally or inside a VE/VM
+# locally or inside a VE/VM/RM
 # Additional required modules only used locally are called with a require
 # in their respective section
@@ -51 +51 @@
 my %pbtag;                  # per package
 my $pbrev;                  # Global REVISION variable
-my $pbaccount;              # Login to use to connect to the VM
+my $pbaccount;              # Login to use to connect to the VM/RM
 my $pbtarget;               # Target os-ver-arch you want to build for
-my $pbport;                 # Port to use to connect to the VM
+my $pbport;                 # Port to use to connect to the VM/RM
 my $newver;                 # New version to create
 my $iso = undef;            # ISO image for the VM to create
@@ -113 +113 @@
 =item B<-m|--machine os-ver-arch[,os-ver-arch,...]>
 
-Name of the Virtual Machines (VM) or Virtual Environments (VE) you want to build on (coma separated). 
+Name of the Virtual Machines (VM), Virtual Environments (VE) or Remote Machines (RM) 
+you want to build on (coma separated). 
 All if none precised (or use the env variable PBV).
 
 =item B<-s|--script script>
 
-Name of the script you want to execute on the related VMs or VEs.
+Name of the script you want to execute on the related VMs/VEs/RMs.
 
 =item B<-g|--nographic>
@@ -130 +131 @@
 =item B<-a|--account account>
 
-Name of the account to use to connect on the related VMs.
+Name of the account to use to connect on the related VMs/RMs.
 
 =item B<-P|--port port_number>
 
-Port number to use to connect on the related VMs.\n";
+Port number to use to connect on the related VMs/RMs.";
 
 =item B<-p|--project project_name>
@@ -204 +205 @@
 Create packages in VMs, launching them if needed
 and send those packages to a SSH host once built
-VM type supported are QEMU
+VM type supported are QEMU and KVM
 
 =item B<build2ve>
@@ -211 +212 @@
 and send those packages to a SSH host once built
 
+=item B<build2rm>
+
+Create packages in RMs, which should pre-exist,
+and send those packages to a SSH host once built
+RM means Remote Machine, and could be a physical or Virtual one.
+This is one buildfarm integration for pb.
+
 =item B<sbx2vm>
 
@@ -219 +227 @@
 sbx2build + build2ve
 
+=item B<sbx2rm>
+
+sbx2build + build2rm
+
 =item B<cms2vm>
 
@@ -226 +238 @@
 
 cms2build + build2ve
+
+=item B<cms2rm>
+
+cms2build + build2rm
 
 =item B<launchvm>
@@ -244 +260 @@
 Execute a script in a virtual environment
 
+=item B<script2rm>
+
+Execute a script on a remote machine
+
 =item B<newvm>
 
@@ -259 +279 @@
 
 Setup a virtual environment for pb usage
+
+=item B<setuprm>
+
+Setup a remote machine for pb usage
 
 =item B<sbx2setupvm>
@@ -270 +294 @@
 Reserved to dev team.
 
+=item B<sbx2setuprm>
+
+Setup a remote machine for pb usage using the sandbox version of pb instead of the latest stable
+Reserved to dev team.
+
 =item B<snapvm>
 
@@ -286 +315 @@
 Update the distribution in the virtual environment
 
+=item B<updaterm>
+
+Update the distribution in the remote machine
+
 =item B<test2pkg>
 
@@ -297 +330 @@
 
 Test a package in a virtual environment
+
+=item B<test2rm>
+
+Test a package in a remote machine
 
 =item B<newver>
@@ -569 +606 @@
 } elsif ($action =~ /^pkg2ssh$/) {
     pb_pkg2ssh();
+} elsif ($action =~ /^build2rm$/) {
+    pb_build2v("rm","build");
 } elsif ($action =~ /^build2ve$/) {
     pb_build2v("ve","build");
 } elsif ($action =~ /^build2vm$/) {
     pb_build2v("vm","build");
+} elsif ($action =~ /^cms2rm$/) {
+    pb_cms2build("CMS");
+    pb_build2v("rm","build");
 } elsif ($action =~ /^cms2ve$/) {
     pb_cms2build("CMS");
     pb_build2v("ve","build");
+} elsif ($action =~ /^sbx2rm$/) {
+    pb_cms2build("SandBox");
+    pb_build2v("rm","build");
 } elsif ($action =~ /^sbx2ve$/) {
     pb_cms2build("SandBox");
@@ -593 +638 @@
 } elsif ($action =~ /^script2ve$/) {
     pb_script2v($pbscript,"ve");
+} elsif ($action =~ /^script2rm$/) {
+    pb_script2v($pbscript,"rm");
 } elsif ($action =~ /^newver$/) {
     pb_newver();
@@ -604 +651 @@
     pb_log(0, "and perl, sudo, ntpdate and scp/ssh installed\n");
     pb_log(0, "You should then be able to login with ssh -p VMPORT root\@localhost (if VM started with pb)\n");
+} elsif ($action =~ /^setuprm$/) {
+    pb_setup2v("rm");
 } elsif ($action =~ /^setupve$/) {
     pb_setup2v("ve");
 } elsif ($action =~ /^setupvm$/) {
     pb_setup2v("vm");
+} elsif ($action =~ /^sbx2setuprm$/) {
+    die "This feature is limited to the pb project" if ($ENV{'PBPROJ'} ne $appname);
+    pb_cms2build("SandBox");
+    pb_setup2v("rm","SandBox");
 } elsif ($action =~ /^sbx2setupve$/) {
     die "This feature is limited to the pb project" if ($ENV{'PBPROJ'} ne $appname);
@@ -616 +669 @@
     pb_cms2build("SandBox");
     pb_setup2v("vm","SandBox");
+} elsif ($action =~ /^updaterm$/) {
+    pb_update2v("rm");
 } elsif ($action =~ /^updateve$/) {
     pb_update2v("ve");
@@ -626 +681 @@
 } elsif ($action =~ /^test2pkg$/) {
     pb_test2pkg();
+} elsif ($action =~ /^test2rm$/) {
+    pb_build2v("rm","test");
 } elsif ($action =~ /^test2ve$/) {
     pb_build2v("ve","test");
@@ -827 +884 @@
             pb_log(0,"Build files are being generated for ...\n");
             my %virt;
-            # De-duplicate similar VM and VE 
+            # De-duplicate similar VM/VE/RM
             foreach my $d (split(/,/,$tmpl)) {
                 # skip ill-formatted vms (name-ver-arch)
@@ -835 +892 @@
 
             # Try to use // processing here
-            my $pm = new Parallel::ForkManager($pbparallel) if (defined $pbparallel);
+            my $pm;
+            $pm = new Parallel::ForkManager($pbparallel) if (defined $pbparallel);
 
             foreach my $d (keys %virt) {
@@ -1080 +1138 @@
     chdir "$ENV{'PBBUILDDIR'}";
     my $made = ""; # pkgs made during build
-    my $pm = new Parallel::ForkManager($pbparallel) if (defined $pbparallel);
+    my $pm;
+    $pm = new Parallel::ForkManager($pbparallel) if (defined $pbparallel);
 
     # We need to communicate info back from the children if parallel so prepare a dir for that
@@ -1348 +1407 @@
     }
 
-    # Keep track of what is generated so that we can get them back from VMs
+    # 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'}";
     print KEEP "$made\n";
@@ -1384 +1443 @@
 
 # By default deliver to the the public site hosting the 
-# ftp structure (or whatever) or a VM/VE
+# ftp structure (or whatever) or a VM/VE/RM
 sub pb_send2target {
 
@@ -1409 +1468 @@
         $host = "vmhost";
         $port = "vmport";
+    } elsif ($cmt =~ /^RM/) {
+        $login = "rmlogin";
+        $dir = "pbdefdir";
+        # Specific RM
+        $tmout = "rmtmout";
+        $path = "rmpath";
+        $host = "rmhost";
+        $port = "rmport";
     } elsif ($cmt =~ /^VE/) {
         $login = "velogin";
@@ -1464 +1531 @@
     }
 
-    if ($cmt =~ /V[EM]build/) {
+    if ($cmt =~ /(V[EM]|RM)build/) {
         $src="$src $ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb $ENV{'PBDESTDIR'}/$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.pb $ENV{'PBETC'} $ENV{'PBDESTDIR'}/pbrc $ENV{'PBDESTDIR'}/pbscript.$$";
-    } elsif ($cmt =~ /V[EM]Script/) {
+    } elsif ($cmt =~ /(V[EM]|RM)Script/) {
         $src="$src $ENV{'PBDESTDIR'}/pbscript.$$";
-    } elsif ($cmt =~ /V[EM]test/) {
+    } elsif ($cmt =~ /(V[EM]|RM)test/) {
         $src="$src $ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb $ENV{'PBDESTDIR'}/$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.pb $ENV{'PBETC'} $ENV{'PBDESTDIR'}/pbrc $ENV{'PBDESTDIR'}/pbscript.$$ $ENV{'PBDESTDIR'}/pbtest";
     } elsif (($cmt eq "Announce") || ($cmt eq "Web")) {
@@ -1498 +1565 @@
         ($vepath) = pb_conf_get($path);
     }
-    if ($cmt =~ /^VM/) {
+    if ($cmt =~ /^(V|R)M/) {
         ($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($ddir,$dver,$darch,$sshhost,$dfam,$dtype,$dos);
     }
     pb_log(2,"ssh: ".Dumper(($sshhost,$sshlogin,$sshdir,$sshport,$vtmout,$vepath,$rbsconf))."\n");
@@ -1505 +1577 @@
     my $mac;
     if ($cmt !~ /^VE/) {
-        $mac = "$sshlogin->{$ENV{'PBPROJ'}}\@$sshhost->{$ENV{'PBPROJ'}}";
+        $mac = "$sshlogin->{$ENV{'PBPROJ'}}\@$sshmachine";
         # Overwrite account value if passed as parameter
-        $mac = "$pbaccount\@$sshhost->{$ENV{'PBPROJ'}}" if (defined $pbaccount);
+        $mac = "$pbaccount\@$sshmachine" if (defined $pbaccount);
         pb_log(2, "DEBUG: pbaccount: $pbaccount => mac: $mac\n") if (defined $pbaccount);
     } else {
@@ -1518 +1590 @@
     my $tdir;
     my $bdir;
-    if (($cmt eq "Sources") || ($cmt =~ /V[EM]Script/)) {
+    if (($cmt eq "Sources") || ($cmt =~ /(V[EM]|RM)Script/)) {
         $tdir = "$sshdir->{$ENV{'PBPROJ'}}/$delivery->{$ENV{'PBPROJ'}}/src";
-    } elsif (($cmt =~ /V[EM]build/)  || ($cmt =~ /V[EM]test/)) {
+    } elsif ($cmt =~ /(V[EM]|RM)(build|test)/) {
         $tdir = $sshdir->{$ENV{'PBPROJ'}}."/$ENV{'PBPROJ'}/delivery";
         $bdir = $sshdir->{$ENV{'PBPROJ'}}."/$ENV{'PBPROJ'}/build";
@@ -1714 +1786 @@
 
     my $tm = undef;
-    if ($cmt =~ /^VM/) {
+    if ($cmt =~ /^(V|R)M/) {
         $tm = $vtmout->{$ENV{'PBPROJ'}};
     }
@@ -1726 +1798 @@
         $cpcmd = "scp -i $keyfile -p -o UserKnownHostsFile=/dev/null -P $nport";
         $cptarget = "$mac:$tdir";
-        if ($cmt =~ /^VMbuild/) {
+        if ($cmt =~ /^(V|R)Mbuild/) {
             $cp2target = "$mac:$bdir";
         }
@@ -1773 +1845 @@
     # Use the right script name depending on context
     my $pbscript;
-    if ($cmt =~ /^V[EM]/) {
+    if ($cmt =~ /^(V[EM]|RM)/) {
         $pbscript = "pbscript.$$";
     } else {
@@ -1780 +1852 @@
 
     pb_system("$shcmd \"echo \'cd $tdir ; if [ -x $pbscript ]; then ./$pbscript; fi ; rm -f ./$pbscript\' | bash\"","Executing pbscript on $cptarget if needed","verbose");
-    if ($cmt =~ /^V[EM]build/) {
-        # Get back info on pkg produced, compute their name and get them from the VM
+    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");
         # For VE we need to change the owner manually
@@ -1788 +1860 @@
         }
         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'}.$$");
+            pb_log(0,"Problem with VM/RM $v on $ENV{'PBBUILDDIR'}/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.$$");
         } else {
             open(KEEP,"$ENV{'PBBUILDDIR'}/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.$$") || die "Unable to read $ENV{'PBBUILDDIR'}/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.$$";
@@ -1801 +1873 @@
             my $made = "";
     
-            # For VM we don't want shell expansion to hapen locally but remotely
+            # For VM/RM we don't want shell expansion to hapen locally but remotely
             my $delim = '\'';
             if ($cmt =~ /^VEbuild/) {
@@ -1834 +1906 @@
         }
     }
-    unlink("$ENV{'PBDESTDIR'}/pbscript.$$") if ($cmt =~ /^V[ME]/);
+    unlink("$ENV{'PBDESTDIR'}/pbscript.$$") if ($cmt =~ /^(V[ME]|RM)/);
 
     pb_log(2,"Before halt, vmexist: $vmexist, vmpid: $vmpid\n");
@@ -1884 +1956 @@
     my $vtype=shift;
     my $pbforce=shift || 0; # Force stop of VM. Default not.
-    my $vm1=shift || undef; # Only that VM to treat. Default all.
+    my $vm1=shift || undef; # Only that VM/VE/RM to treat. Default all.
     my $snapme=shift || 0;  # Do we have to create a snapshot. Default not.
     my $vm;
@@ -1890 +1962 @@
 
     pb_log(2,"DEBUG: pb_script2v($pbscript,$vtype,$pbforce,".Dumper($vm1).",$snapme)\n");
-    # Prepare the script to be executed on the VM
+    # Prepare the script to be executed on the VM/VE/RM
     # in $ENV{'PBDESTDIR'}/pbscript.$$
     if ((defined $pbscript ) && ($pbscript ne "$ENV{'PBDESTDIR'}/pbscript.$$")) {
@@ -1911 +1983 @@
             pb_log(2,"DEBUG: After pb_launchv, vmexist: $vmexist, vmpid: $vmpid\n");
 
-            # Skip that VM if something went wrong
+            # Skip that VM/RM if something went wrong
             next if (($vmpid == 0) && ($vmexist == 0));
 
@@ -1925 +1997 @@
         }
 
-        # Gather all required files to send them to the VM 
+        # Gather all required files to send them to the VM/VE/RM
         # and launch the build through pbscript
         pb_log(2,"DEBUG: Before send2target, vmexist: $vmexist, vmpid: $vmpid\n");
@@ -1936 +2008 @@
     my $vtype = shift;
     my $v = shift;
-    my $create = shift || 0;        # By default do not create a VM/VE
-    my $snapme = shift || 0;        # By default do not snap a VM/VE
-    my $usesnap = shift || 1;       # By default study the usage of the snapshot feature of VM/VE
+    my $create = shift || 0;        # By default do not create a VM/VE/RM
+    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
 
     # If creation or snapshot creation mode, no snapshot usable
@@ -1946 +2018 @@
 
     pb_log(2,"DEBUG: pb_launchv($vtype,$v,$create,$snapme,$usesnap)\n");
-    die "No VM/VE defined, unable to launch" if (not defined $v);
+    die "No VM/VE/RM defined, unable to launch" if (not defined $v);
     # Keep only the first VM in case many were given
     $v =~ s/,.*//;
@@ -2075 +2147 @@
         pb_log(2,"DEBUG: pb_launchv returns ($vmexist,$vmpid)\n");
         return($vmexist,$vmpid);
-    # VE here
-    } else {
+    } elsif ($vtype eq "ve") {
+        # VE here
         # Get distro context
         my ($name,$ver,$darch) = split(/-/,$v);
@@ -2244 +2316 @@
             die "VE of type $vetype not supported. Report to the dev team";
         }
+    } else {
+        # RM here
+        # Get distro context
+        my ($name,$ver,$darch) = split(/-/,$v);
+        chomp($darch);
+        my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf) = pb_distro_init($name,$ver,$darch);
+
+        # Get RM context
+        my ($ptr,$rmpath) = pb_conf_get("rmtype","rmpath");
+
+        # Nothing more to do for RM. No real launch
+        # For the moment we support the RM is already running
+        # For ProLiant may be able to power them on if needed later on as an example.
     }
 }
@@ -2294 +2379 @@
 
 my ($vmexist,$vmpid) = (undef,undef);
-my $pm = new Parallel::ForkManager($pbparallel) if (defined $pbparallel);
-
-# Set which port the VM will use to communicate
-$pm->run_on_start(\&pb_set_port);
+my $pm;
+if (defined $pbparallel) {
+    $pm = new Parallel::ForkManager($pbparallel);
+
+    # Set which port the VM/RM will use to communicate
+    $pm->run_on_start(\&pb_set_port);
+}
 
 my $counter = 0;
@@ -2303 +2391 @@
     $counter++;
     # Modulo 2 * pbparallel (to avoid synchronization problems)
-    $counter = 1 if ($counter > 2 * $pbparallel);
+    $counter = 1 if ((defined $pbparallel) && ($counter > 2 * $pbparallel));
     $pm->start($counter) and next if (defined $pbparallel);
-    # Prepare the script to be executed on the VM/VE
+    # Prepare the script to be executed on the VM/VE/RM
     # in $ENV{'PBDESTDIR'}/pbscript.$$
     open(SCRIPT,"> $ENV{'PBDESTDIR'}/pbscript.$$") || die "Unable to create $ENV{'PBDESTDIR'}/pbscript.$$";
@@ -2402 +2490 @@
     chmod 0755,"$ENV{'PBDESTDIR'}/pbscript.$$";
     
-    # Launch the VM/VE
+    # Launch the VM/VE/RM
     ($vmexist,$vmpid) = pb_launchv($vtype,$v,0);
 
@@ -2413 +2501 @@
         }
     } else {
-        # VE
+        # VE/RM
         $vmexist = 0;
         $vmpid = 0;
@@ -2423 +2511 @@
     $pm->finish if (defined $pbparallel);
 }
-if (defined $pbparallel) {
-    $pm->wait_all_children;
-}
+$pm->wait_all_children if (defined $pbparallel);
 }
 
@@ -2534 +2620 @@
 
 #
-# Return the list of VMs/VEs we are working on
+# 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
@@ -2543 +2629 @@
 my @v;
 my $all = 0;
-my $vlist;
 my $pbv = 'PBV';
-
-if ($vtype eq "vm") {
-    $vlist = "vmlist";
-} elsif ($vtype eq "ve") {
-    $vlist = "velist";
-}
+my $vlist = $vtype."list";
+
 # Get VM/VE list
 if ((not defined $ENV{$pbv}) || ($ENV{$pbv} =~ /^all$/)) {
@@ -2562 +2643 @@
 }
 
-# Function to create a potentialy missing pb account on the VM/VE, and adds it to sudo
-# Needs to use root account to connect to the VM/VE
+# Function to create a potentialy missing pb account on the VM/VE/RM, and adds it to sudo
+# Needs to use root account to connect to the VM/VE/RM
 # pb will take your local public SSH key to access
-# the pb account in the VM later on if needed
+# the pb account in the VM/VE/RM later on if needed
 sub pb_setup2v {
 
@@ -2579 +2660 @@
 $pbparallel = pb_set_parallel($vtype);
 
-my $pm = new Parallel::ForkManager($pbparallel) if (defined $pbparallel);
-
-# Set which port the VM will use to communicate
-$pm->run_on_start(\&pb_set_port);
+my $pm;
+if (defined $pbparallel) {
+    $pm = new Parallel::ForkManager($pbparallel);
+
+    # Set which port the VM/RM will use to communicate
+    $pm->run_on_start(\&pb_set_port);
+}
 
 my $counter = 0;
@@ -2588 +2672 @@
     $counter++;
     # Modulo pbparallel
-    $counter = 1 if ($counter > $pbparallel);
+    $counter = 1 if ((defined $pbparallel) && ($counter > $pbparallel));
     $pm->start($counter) and next if (defined $pbparallel);
 
@@ -2599 +2683 @@
     my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd, $pbins) = pb_distro_init($name,$ver,$darch);
     
-    # Name of the account to deal with for VM/VE
+    # Name of the account to deal with for VM/VE/RM
     # Do not use the one passed potentially with -a
     my ($pbac) = pb_conf_get($vtype."login");
@@ -2605 +2689 @@
     my ($vmexist,$vmpid);
 
-    # Prepare the script to be executed on the VM/VE
+    # Prepare the script to be executed on the VM/VE/RM
     # in $ENV{'PBDESTDIR'}/setupv
     open(SCRIPT,"> $pbscript") || die "Unable to create $pbscript";
@@ -2630 +2714 @@
 EOF
 
-    # Launch the VM/VE - Usage of snapshot disabled
+    # Launch the VM/VE/RM - Usage of snapshot disabled
     ($vmexist,$vmpid) = pb_launchv($vtype,$v,0,0,0);
 
@@ -2637 +2721 @@
     my $vmhost;
 
-    if ($vtype eq "vm") {
+    if ($vtype =~ /(v|r)m/) {
         # Prepare the key to be used and transfered remotely
         $keyfile = pb_ssh_get(1);
         
         my ($vmport,$vmntp);
-        ($vmhost,$vmport,$vmntp) = pb_conf_get("vmhost","vmport","vmntp");
+        ($vmhost,$vmport,$vmntp) = pb_conf_get($vtype."host",$vtype."port",$vtype."ntp");
         $nport = pb_get_port($vmport->{$ENV{'PBPROJ'}});
     
-        # Skip that VM if something went wrong
+        # Skip that VM/RM if something went wrong
         next if (($vmpid == 0) && ($vmexist == 0));
     
@@ -2657 +2741 @@
         # We call true to avoid problems if SELinux is not activated, but chcon is present and returns in that case 1
         pb_system("cat $keyfile.pub | ssh -q -o UserKnownHostsFile=/dev/null -p $nport -i $keyfile root\@$vmhost->{$ENV{'PBPROJ'}} \"mkdir -p .ssh ; chmod 700 .ssh ; cat >> .ssh/authorized_keys ; chmod 600 .ssh/authorized_keys ; if [ -x /usr/bin/chcon ]; then /usr/bin/chcon -Rt home_ssh_t .ssh 2> /dev/null; /bin/true; fi\"","Copying local keys to $vtype. This may require the root password");
-        # once this is done, we can do what we want on the VM remotely
+        # once this is done, we can do what we need on the VM/RM remotely
     } elsif ($vtype eq "ve") {
         print SCRIPT << "EOF";
@@ -2670 +2754 @@
     }
 
-if ($vtype eq "vm") {
+if ($vtype =~ /(v|r)m/) {
         print SCRIPT << 'EOF';
 # Removes duplicate in .ssh/authorized_keys of our key if needed
@@ -2713 +2797 @@
 EOF
 
+# TODO: use an external parameter
 my $home = "/home";
 # Solaris doesn't like that we use /home
@@ -2726 +2811 @@
     }
 EOF
+    # TODO: Level of portability of these cmds ?
     print SCRIPT << "EOF";
 pb_system("/usr/sbin/groupadd $pbac->{$ENV{'PBPROJ'}}","Adding group $pbac->{$ENV{'PBPROJ'}}");
@@ -2732 +2818 @@
 EOF
 
-    # Copy the content of our local conf file to the VM/VE
+    # Copy the content of our local conf file to the VM/VE/RM
     my $content = pb_get_content(pb_distro_conffile());
     print SCRIPT << "EOF";
@@ -2746 +2832 @@
 EOF
 
-    if ($vtype eq "vm") {
+    if ($vtype =~ /(v|r)m/) {
         print SCRIPT << "EOF";
 # allow ssh entry to build
@@ -2825 +2911 @@
 close(PBFILE);
 EOF
+    # TODO: To be refined for RM
     print SCRIPT << "EOF";
 # Some distro force requiretty at compile time, so disable here
@@ -2867 +2954 @@
     my ($instype) = pb_conf_get("pbinstalltype");
     my $itype = pb_distro_get_param($ddir,$dver,$darch,$instype,$dfam,$dtype,$dos);
-    if (defined $sbx) {
-        # Install from sandbox mean a file base install
-        $itype = "file";
-    }
+    # Install from sandbox mean a file base install
+    $itype = "file" if (defined $sbx);
     if ($itype =~ /^file/) {
         my $cmdget;
@@ -2989 +3074 @@
     $pm->finish if (defined $pbparallel);
 }
-if (defined $pbparallel) {
-    $pm->wait_all_children;
-}
+$pm->wait_all_children if (defined $pbparallel);
 return;
 }
@@ -3038 +3121 @@
 }
 
-# Function to update a VMs or VEs with the latest distribution content
+# Function to update VMs/VEs/RMs with the latest distribution content
 sub pb_update2v {
 
@@ -3056 +3139 @@
     my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd, $pbins) = pb_distro_init($name,$ver,$darch);
 
-    # Prepare the script to be executed on the VM/VE
+    # Prepare the script to be executed on the VM/VE/RM
     # in $ENV{'PBDESTDIR'}/updatev
     open(SCRIPT,"> $pbscript") || die "Unable to create $pbscript";
@@ -3540 +3623 @@
 }
 
-# Manages VM SSH port communication
+# Manages VM/RM SSH port communication
 sub pb_get_port {
 
@@ -3605 +3688 @@
     }
 }
-pb_log(2,"pb_set_parallel returns: $pbparallel\n");
+pb_log(2,"pb_set_parallel returns: $pbparallel\n") if (defined $pbparallel);
 return($pbparallel);
 }

devel/pb/lib/ProjectBuilder/CMS.pm

@@ -227 +227 @@
 
     # Check whether the file is well formed 
-     (containing already a directory with the project-version name)
+    # (containing already a directory with the project-version name)
     #
     # If it's not the case, we try to adapt, but distro needing 
@@ -711 +711 @@
     my $cmsurl = pb_cms_get_uri($scheme,$ENV{$envar});
     my ($scheme2, $account2, $host2, $port2, $path2) = pb_get_uri($cmsurl);
+    # For svk, scheme doesn't appear in svk info so remove it here in uri coming from conf file 
+    # which needs it to trigger correct behaviour
+    $uri =~ s/^svk://;
     if ($cmsurl ne $uri) {
         # The local content doesn't correpond to the repository

devel/pb/lib/ProjectBuilder/Env.pm

@@ -95 +95 @@
 # where to find Build System infos:
 #vmpath default = /home/qemu
-#vepath default = /home/rinse
+#vepath default = /home/rpmbootstrap
+#rmpath default = /home/remote
 
 # Overwrite generic setup
@@ -168 +169 @@
 # Adds a potential conf file now as it's less 
 # important than the project conf file
-my ($vmpath,$vepath) = pb_conf_get_if("vmpath","vepath");
+my ($vmpath,$vepath,$rmpath) = pb_conf_get_if("vmpath","vepath","rmpath");
 pb_conf_add("$vmpath->{$ENV{'PBPROJ'}}/.pbrc") if ((defined $vmpath) && (-f "$vmpath->{$ENV{'PBPROJ'}}/.pbrc"));
 pb_conf_add("$vepath->{$ENV{'PBPROJ'}}/.pbrc") if ((defined $vepath) && (-f "$vepath->{$ENV{'PBPROJ'}}/.pbrc"));
+pb_conf_add("$rmpath->{$ENV{'PBPROJ'}}/.pbrc") if ((defined $rmpath) && (-f "$rmpath->{$ENV{'PBPROJ'}}/.pbrc"));
 
 #
@@ -282 +284 @@
 pb_log(2,"PBBUILDDIR: $ENV{'PBBUILDDIR'}\n");
 
-#
-# The following part is only useful when in cms2something or newsomething
-# In VMs/VEs we want to skip that by providing good env vars.
+return if ($action =~ /^clean$/);
+#
+# The following part is only useful when in sbx|cms2something or newsomething
+# In VMs/VEs/RMs we want to skip that by providing good env vars.
 # return values in that case are useless
 #
-return if ($action =~ /^clean$/);
 
 if (($action =~ /^cms2/) || ($action =~ /^sbx2/) || ($action =~ /^newver$/) || ($action =~ /pbinit/) || ($action =~ /^newproj$/) || ($action =~ /^announce/)) {