From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Tue, 18 Dec 2007 07:05:11 +0000 (+0000)
Subject: attempt to remove red herrings in complaints during rpm installs
X-Git-Tag: 4.2-rc2~322
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=2df7b863e9c896ae1761b975fb0ee9c93c0dced8;p=build.git

attempt to remove red herrings in complaints during rpm installs
---

diff --git a/build.common b/build.common
index 9d5afa0e..7e65eef3 100644
--- a/build.common
+++ b/build.common
@@ -128,7 +128,7 @@ function pl_process_fedora_options () {
 function pl_root_rpm_macros () {
     cat <<EOF
 %_install_langs C:en_US:en
-%_netsharedpath /proc:/dev/pts
+%_netsharedpath /proc:/dev/pts:/usr/share/info
 %_excludedocs 1
 %__file_context_path /dev/null
 EOF
diff --git a/vbuild-nightly.sh b/vbuild-nightly.sh
index 9e10a684..abe5831a 100755
--- a/vbuild-nightly.sh
+++ b/vbuild-nightly.sh
@@ -148,7 +148,6 @@ function runtest () {
 	failure
 	exit 1
     fi
-    rpms_url=${TESTBUILDURL}${PLDISTRO}/${BASE}/RPMS/
     url=${TESTBUILDURL}${PLDISTRO}/${BASE}/RPMS/i386/${rpm}
 
     # compute test directory name on test box
@@ -157,14 +156,8 @@ function runtest () {
     ssh ${TESTBOXSSH} rm -rf ${testdir}
     # check it out
     ssh ${TESTBOXSSH} svn co ${TESTSVNPATH} ${testdir}
-    # store the myplc http url in the newly created test dir - for testing in chroot mode
-    echo ${url} | ssh ${TESTBOXSSH} "cat > ${testdir}/MYPLC-URL"
-    # store the build svn path in the newly created test dir - so it can perform myplc-init-vserver
-    echo ${SVNPATH} | ssh ${TESTBOXSSH} "cat > ${testdir}/BUILD-URL"
-    # store the rpms http url in the newly created test dir - for passing to myplc-init-vserver
-    echo ${rpms_url} | ssh ${TESTBOXSSH} "cat > ${testdir}/RPMS-URL"
-    # invoke test on testbox
-    ssh 2>&1 ${TESTBOXSSH} python -u ${testdir}/${TESTSCRIPT} ${url} 
+    # invoke test on testbox - pass url and build url - so the tests can use myplc-init-vserver.sh
+    ssh 2>&1 ${TESTBOXSSH} python -u ${testdir}/${TESTSCRIPT} --build ${SVNPATH} --url ${url} 
     # still missing - need to populate /var/www/html/install-rpms on the myplc
 	
     if [ "$?" != 0 ] ; then