Migrate docs to the new Danube dir structure.

[ovsnfv.git] / build / BuildAndTestOVS.sh

diff --git a/build/BuildAndTestOVS.sh b/build/BuildAndTestOVS.sh
index 0a5f357..6017c14 100755 (executable)
--- a/build/BuildAndTestOVS.sh
+++ b/build/BuildAndTestOVS.sh
@@ -133,7 +133,7 @@ export TOPDIR=$BUILD_BASE
 
 export TMP_RELEASE_DIR=$TOPDIR/release
 export CACHE_DIR=$TOPDIR/cache
-export TMPDIR=$TOPDIR/scratch
+export TEMPDIR=$TOPDIR/scratch
 export RPMDIR=$TOPDIR/rpmbuild
 
 
@@ -157,21 +157,15 @@ echo "==============================="
 echo build OVS rpm locally
 echo
     ./build_ovs_rpm.sh $setnocheck -g $TAG $setdpdk $setkmod -p $OVS_PATCH -u $OVS_REPO_URL
-#
-# Test rpm
-#
-if [ ! -z $TESTRPM ]; then
-    ./test_ovs_rpm.sh $setdpdk $setkmod
-fi
 
-#
-# If tests pass, copy rpms to release dir
-#
 echo "==============================="
 echo copy rpms to release dir
 echo
-cp $RPMDIR/RPMS/x86_64/* $TMP_RELEASE_DIR
-rm $RPMDIR/RPMS/x86_64/*
+cp $RPMDIR/RPMS/x86_64/*.rpm $TMP_RELEASE_DIR || true
+rm $RPMDIR/RPMS/x86_64/*.rpm || true
+cp $BUILD_BASE/rpms/*.rpm $TMP_RELEASE_DIR || true
+cp $BUILD_BASE/ovsrpm/ovs/rpm/rpmbuild/RPMS/x86_64/*.rpm $TMP_RELEASE_DIR || true
+cp $BUILD_BASE/ovsrpm/ovs/rpm/rpmbuild/RPMS/no_arch/*.rpm $TMP_RELEASE_DIR || true
 
 #
 # Build OVS without DPDK, apply patches and build kmod.
@@ -184,16 +178,7 @@ echo "==================================================="
 echo build OVS without DPDK, apply patches and build kmod.
 echo
     ./build_ovs_rpm.sh $setnocheck -g $TAG $setdpdk $setkmod -p $OVS_PATCH -u $OVS_REPO_URL
-#
-# Test rpm
-#
-if [ ! -z $TESTRPM ]; then
-    ./test_ovs_rpm.sh $setdpdk $setkmod
-fi
 
-#
-# If tests pass, copy rpms to release dir
-#
 echo "==============================="
 echo copy rpms to release dir and add experimental tag
 echo