X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=ovsnfv.git;a=blobdiff_plain;f=build%2FBuildAndTestOVS.sh;fp=build%2FBuildAndTestOVS.sh;h=6017c149a03312b993fdfb2db8a50f9b7eee5f03;hp=57d2d2db148b1f222dee0d66ffe31971e8a79cd7;hb=68444d67424763ad483df9c02732847e243c4887;hpb=4bf728e6fcf73602c05eb7af5392b0ad18602183

diff --git a/build/BuildAndTestOVS.sh b/build/BuildAndTestOVS.sh
index 57d2d2d..6017c14 100755
--- 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
 
 
@@ -161,8 +161,11 @@ echo
 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.