From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Mon, 5 May 2008 14:55:05 +0000 (+0000)
Subject: drop support for old chroot-based packages in tests/system
X-Git-Tag: 4.2-rc3~47
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=513e96c6236707108759b132b37d1b3beca9584a;p=build.git

drop support for old chroot-based packages in tests/system
minor impact on the build for tests invokation, as this interface has changed
---

diff --git a/vbuild-nightly.sh b/vbuild-nightly.sh
index 12074870..14720d66 100755
--- a/vbuild-nightly.sh
+++ b/vbuild-nightly.sh
@@ -165,14 +165,21 @@ function runtest () {
 
     echo -n "============================== Starting $COMMAND:runtest on $(date)"
 
-    ### the URL to the myplc package
-    rpm=$( find /vservers/$BASE/build/RPMS -name 'myplc-[0-9]*' )
-    if [ ${#rpm[@]} != 1 ] ; then
-	echo "$COMMAND: Cannot locate rpm for testing"
+    ### the URL to the RPMS/<arch> location
+    url=""
+    for a in i386 x86_64; do
+	archdir=/vservers/$BASE/build/RPMS/$a
+	if [ -d $archdir ] ; then
+	    url=$(echo $archdir | sed -e "s,/vservers/$BASE/build,${TESTBUILDURL}${PLDISTRO}/${BASE},")
+	    break
+	fi
+    done
+
+    if [ -z "$url" ] ; then
+	echo "$COMMAND: Cannot locate arch URL for testing"
 	failure
 	exit 1
     fi
-    url=$(echo $rpm | sed -e "s,/vservers/$BASE/build,${TESTBUILDURL}${PLDISTRO}/${BASE},")
 
     # test directory name on test box
     testdir=${BASE}