From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Mon, 17 Mar 2008 16:25:12 +0000 (+0000)
Subject: be smarter when locating myplc rpm, for non i386 archs
X-Git-Tag: 4.2-rc2~140
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=3d775171701638da190d37e569bea2437fa23e4a;p=build.git

be smarter when locating myplc rpm, for non i386 archs
---

diff --git a/vbuild-nightly.sh b/vbuild-nightly.sh
index 59300193..b753343a 100755
--- a/vbuild-nightly.sh
+++ b/vbuild-nightly.sh
@@ -189,13 +189,13 @@ function runtest () {
     echo -n "============================== Starting $COMMAND:runtest on $(date)"
 
     ### the URL to the myplc package
-    rpm=$( (cd /vservers/$BASE/build/RPMS/i386 ; ls myplc-[0-9]*.rpm) )
+    rpm=$( find /vservers/$BASE/build/RPMS -name 'myplc-[0-9]*' )
     if [ ${#rpm[@]} != 1 ] ; then
 	echo "$COMMAND: Cannot locate rpm for testing"
 	failure
 	exit 1
     fi
-    url=${TESTBUILDURL}${PLDISTRO}/${BASE}/RPMS/i386/${rpm}
+    url=$(echo $rpm | sed -e "s,/vservers/$BASE/build,${TESTBUILDURL}${PLDISTRO}/${BASE},")
 
     # compute test directory name on test box
     testdir=test-${BASE}