Changeset 200 in ProjectBuilder for devel

Timestamp:

Oct 13, 2007, 2:26:55 AM (18 years ago)

Author:

Bruno Cornec

Message:

More fixes for handling creation/destruction of VMs
SuSE 10.0 forces bz2 files (not more recent versions)

Location:

devel/pb

Files:

• bin/pb (modified) (10 diffs)
• contrib/pbsetupqemu (modified) (2 diffs)

devel/pb/bin/pb

@@ -338 +338 @@
 
         my $src="$ENV{'PBDESTDIR'}/$pbpkg-$pbver.tar.gz";
-        # Suse < 10.2 forces tar.bz2 usage :-(
-        if ($ddir eq "suse") {
-            print "SuSE needs bz2 type of packages so recompressing...\n";
+        # Suse 10.0 forces tar.bz2 usage :-(
+        if (($ddir eq "suse") && ($dver eq "10.0")) {
+            print "SuSE 10.0 needs bz2 type of packages so recompressing...\n";
             my $newsrc="$ENV{'PBDESTDIR'}/$pbpkg-$pbver.tar.bz2";
             system "gzip -cd $src | bzip2 -c6 > $newsrc";
@@ -450 +450 @@
     my $vm = shift || undef;
     my $vmexist = shift || 0;           # 0 is FALSE
+    my $vmpid = shift || 0;             # 0 is FALSE
     my $host = shift || "sshhost";
     my $login = shift || "sshlogin";
     my $dir = shift || "sshdir";
     my $port = shift || "sshport";
+    my $tmout = shift || "120";
     my $cmd = "";
 
@@ -537 +539 @@
 
     $port = $sshport->{$ENV{'PBPROJ'}};
+    my $tm = $tmout->{$ENV{'PBPROJ'}};
     pb_system("ssh -q -p $port $mac \"mkdir -p $tdir ; cd $tdir ; echo \'for i in $basesrc; do if [ -f \$i ]; then rm -f \$i; fi; done\ ; $cmd' | bash\"","Preparing $tdir on $mac");
     pb_system("cd $ENV{'PBBUILDDIR'} ; scp -p -P $port $src $mac:$tdir 2> /dev/null","$cmt delivery in $tdir on $mac");
@@ -542 +545 @@
     if ($cmt eq "VMs") {
         # Get back info on pkg produced, compute their name and get them from the VM
-        pb_system("scp -p -P $port $mac:$bdir/pbgen-$pbprojver-$pbprojtag $ENV{'PBBUILDDIR'} 2> /dev/null","Get package names in $tdir on $mac");
+        pb_system("scp -p -P $port $mac:$bdir/pbgen-$pbprojver-$pbprojtag $ENV{'PBBUILDDIR'} 2> /dev/null","Get package names in $bdir on $mac");
         open(KEEP,"$ENV{'PBBUILDDIR'}/pbgen-$pbprojver-$pbprojtag") || die "Unable to read $ENV{'PBBUILDDIR'}/pbgen-$pbprojver-$pbprojtag";
         my $src = <KEEP>;
@@ -554 +557 @@
         foreach my $p (split(/ +/,$src)) {
             my $j = basename($p);
-            pb_system("scp -p -P $port $mac:\'$bdir/$p\' $ENV{'PBBUILDDIR'}/$odir/$over 2> /dev/null","Package recovery of $j in $tdir from $mac");
+            pb_system("scp -p -P $port $mac:\'$bdir/$p\' $ENV{'PBBUILDDIR'}/$odir/$over 2> /dev/null","Package recovery of $j in $bdir from $mac");
             $made="$made $odir/$over/$j" if (($dtype ne "rpm") || ($j !~ /.src.rpm$/));
         }
@@ -561 +564 @@
         pb_system("ssh -q -p $port $mac \"rm -rf $tdir $bdir\"","VM cleanup on $mac");
         if (! $vmexist) {
-            pb_system("ssh -q -p $port $mac \"sudo /usr/bin/poweroff \"; sleep 120 ; echo \'if [ -d /proc/$vmexist ]; then kill -9 $vmexist; fi \' | bash ; sleep 10","VM $vm halt (pid $vmexist)");
+            pb_system("ssh -q -p $port $mac \"sudo /usr/bin/poweroff \"; sleep $tm ; echo \'if [ -d /proc/$vmpid ]; then kill -9 $vmpid; fi \' | bash ; sleep 10","VM $vm halt (pid $vmpid)");
         }
         pb_send2ssh("Packages","$odir"."_"."$over");
@@ -582 +585 @@
     foreach my $v (@$vm) {
         # Launch the VM
-        my $vmexist = pb_launchvm($v);
-        if (! $vmexist) {
-            pb_system("sleep 300","Waiting for $v to come up");
-        } else {
-            print "Using VM pid $vmexist\n";
-        }
+        my ($vmexist,$vmpid) = pb_launchvm($v);
 
         # Gather all required files to send them to the VM 
         # and launch the build thourgh pbscript
-        pb_send2ssh("Script","$v",$vmexist,"vmhost","vmlogin","pbrc","vmport");
+        pb_send2ssh("Script","$v",$vmexist,$vmpid,"vmhost","vmlogin","pbrc","vmport","vmtmout");
 
     }
@@ -604 +602 @@
 
     # Launch the VMs
-    my ($ptr,$vmopt,$vmport,$vmpath) = pb_conf_get("vmtype","vmopt","vmport","vmpath");
+    my ($ptr,$vmopt,$vmport,$vmpath,$vmtmout) = pb_conf_get("vmtype","vmopt","vmport","vmpath","vmtmout");
     my $vmtype = $ptr->{$ENV{'PBPROJ'}};
     if (defined $vmopt->{$ENV{'PBPROJ'}}) {
@@ -646 +644 @@
     my ($tmpcmd,$void) = split(/ +/,$cmd);
     my $vmexist = pb_check_ps($tmpcmd,$vmm);
+    my $vmpid = 0;
     if (! $vmexist) {
         pb_system("$cmd &","Launching the VM $vmm");
-    }
-    return($vmexist);
+        pb_system("sleep $vmtmout->{$ENV{'PBPROJ'}}","Waiting for VM $vm to come up");
+        $vmpid = pb_check_ps($tmpcmd,$vmm);
+    } else {
+        print "Found an existing VM $vmm (pid $vmexist)\n";
+    }
+    return($vmexist,$vmpid);
 }
 
@@ -682 +685 @@
     foreach my $v (@$vm) {
         # Launch the VM
-        my $vmexist = pb_launchvm($v);
-        if (! $vmexist) {
-            pb_system("sleep 300","Waiting for $v to come up");
-        } else {
-            print "Using VM pid $vmexist\n";
-        }
+        my ($vmexist,$vmpid) = pb_launchvm($v);
 
         # Gather all required files to send them to the VM 
         # and launch the build thourgh pbscript
-        pb_send2ssh("VMs","$v",$vmexist,"vmhost","vmlogin","pbrc","vmport");
+        pb_send2ssh("VMs","$v",$vmexist,$vmpid,"vmhost","vmlogin","pbrc","vmport","vmtmout");
     }
 }

devel/pb/contrib/pbsetupqemu

@@ -76 +76 @@
 
 my ($ddir, $dver, $dfam, $dtype, $pbsuf) = pb_distro_init(); 
+# Suse wants sudoers as 640
+if (($ddir eq "sles") || ($ddir eq "suse")) {
+    chmod 0640,$file;
+}
 print "distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $pbsuf))."\n";
 
@@ -94 +98 @@
     if ( $dver <= 4 ) {
         # FC4 - AppConfig unavailable
-        system "yum -y $opt install neon newt-devel slang-devel autoconf automake libtool gcc rpm-build wget gcc-c++ docbook-utils-pdf ImageMagick man patch cdrecord mkisofs perl-DateManip ntp ; rm -rf AppConfig-* ; wget http://search.cpan.org/CPAN/authors/id/A/AB/ABW/AppConfig-1.66.tar.gz ; tar xvfz AppConfig-1.66.tar.gz ; cd AppConfig* ; perl Makefile.PL ; make ; make install ; cd ..";
+        system "yum -y $opt install neon newt-devel slang-devel autoconf automake libtool gcc rpm-build wget gcc-c++ docbook-utils-pdf ImageMagick man patch cdrecord mkisofs perl-DateManip ntp sudo ; rm -rf AppConfig-* ; wget http://search.cpan.org/CPAN/authors/id/A/AB/ABW/AppConfig-1.66.tar.gz ; tar xvfz AppConfig-1.66.tar.gz ; cd AppConfig* ; perl Makefile.PL ; make ; make install ; cd ..";
     } else {
         # FC5/6/7
-        system "yum -y $opt install neon newt-devel slang-devel autoconf automake libtool gcc rpm-build wget gcc-c++ docbook-utils-pdf ImageMagick man patch cdrecord mkisofs ntp perl-AppConfig perl-DateManip";
+        system "yum -y $opt install neon newt-devel slang-devel autoconf automake libtool gcc rpm-build wget gcc-c++ docbook-utils-pdf ImageMagick man patch cdrecord mkisofs ntp sudo perl-AppConfig perl-DateManip";
     }
 } elsif (( $dfam eq "rh" ) || ($ddir eq "sles") || (($ddir eq "suse") && (($dver eq "10.1") || ($dver eq "10.0"))) || (($ddir eq "mandrake") && ($dver eq "10.1"))) {
     # Suppose pkg are installed already
-    system "rpm -e lsb";
+    system "rpm -e lsb 2>&1 > /dev/null";
     system "rm -rf AppConfig-* ; wget http://search.cpan.org/CPAN/authors/id/A/AB/ABW/AppConfig-1.66.tar.gz ; tar xvfz AppConfig-1.66.tar.gz ; cd AppConfig* ; perl Makefile.PL ; make ; make install ; cd .. ; rm -rf DateManip* ; wget http://search.cpan.org/CPAN/authors/id/S/SB/SBECK/Date-Manip-5.46.tar.gz ; tar xvfz Date-Manip-5.46.tar.gz ; cd Date-Manip* ; perl Makefile.PL ; make ; make install ; cd .. ";
 } elsif ($ddir eq "suse") { 
     # New OpenSuSE
-    system "export TERM=linux ; liste=\"\" ; for i in neon newt-devel slang-devel autoconf automake libtool gcc wget gcc-c++ docbook-utils ImageMagick man patch mkisofs perl-DateManip perl-AppConfig perl-File-HomeDir xntp; do rpm -q \$i 1> /dev/null 2> /dev/null ; if [ \$\? != 0 ]; then liste=\"\$liste \$i\"; fi; done; echo \"Liste: \$liste\" ; if [ \"\$liste\" != \"\" ]; then yast2 -i \$liste ; fi";
+    system "export TERM=linux ; liste=\"\" ; for i in neon newt-devel slang-devel autoconf automake libtool gcc wget gcc-c++ docbook-utils ImageMagick man patch mkisofs sudo perl-DateManip perl-AppConfig perl-File-HomeDir xntp; do rpm -q \$i 1> /dev/null 2> /dev/null ; if [ \$\? != 0 ]; then liste=\"\$liste \$i\"; fi; done; echo \"Liste: \$liste\" ; if [ \"\$liste\" != \"\" ]; then yast2 -i \$liste ; fi";
 } elsif ( $dfam eq "md" ) {
     if (( $dver eq "2006.0" ) || ( $dver eq "10.2" )) {
         # mondo not available
-        system "urpmi.update -a ; urpmi --auto neon newt-devel slang-devel glibc-static-devel autoconf automake libtool gcc rpm-build wget gcc-c++ docbook-utils-pdf ImageMagick man patch mkisofs cdrecord ntp-client perl-AppConfig perl-DateManip";
+        system "urpmi.update -a ; urpmi --auto neon newt-devel slang-devel glibc-static-devel autoconf automake libtool gcc rpm-build wget gcc-c++ docbook-utils-pdf ImageMagick sudo man patch mkisofs cdrecord ntp-client perl-AppConfig perl-DateManip";
     } else {
         system "urpmi.update -a ; urpmi --auto neon newt-devel slang-devel glibc-static-devel autoconf automake libtool gcc rpm-build wget gcc-c++ docbook-utils-pdf ImageMagick man patch mondo mkisofs cdrecord ntp-client perl-AppConfig perl-DateManip";
     }
 } elsif ( $dfam eq "du" ) {
-    system "apt-get update; apt-get -y install autoconf automake libtool g++ wget patch mondo groff imagemagick docbook-utils docbook2x docbook-to-man openssh-server dpkg-dev debian-builder dh-make fakeroot libnewt-dev ntpdate libncurses5-dev libdate-manip-perl libappconfig-perl";
+    system "apt-get update; apt-get -y install autoconf automake libtool g++ wget patch mondo groff imagemagick docbook-utils docbook2x docbook-to-man openssh-server dpkg-dev sudo debian-builder dh-make fakeroot libnewt-dev ntpdate libncurses5-dev libdate-manip-perl libappconfig-perl";
 } elsif ( $dfam eq "gen" ) {
     system "emerge neon newt slang autoconf automake subversion libtool gcc wget vim man groff lynx grub afio buffer mindi mondo-rescue cdrecord mkisofs ntp-client";