Build OVS 2.6 with DPDK 16.11

[ovsnfv.git] / ci / buildovs.sh

diff --git a/ci/buildovs.sh b/ci/buildovs.sh
index fead8db..eefd380 100755 (executable)
--- a/ci/buildovs.sh
+++ b/ci/buildovs.sh
@@ -56,7 +56,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
 
 mkdir -p $RPMDIR/RPMS
@@ -75,7 +75,7 @@ fi
 echo =============================================
 echo =======Build ovs rpm with DPDK and test in VM.
 echo
-BuildAndTestOVS.sh -d -g master -p none -t
+$BUILD_BASE/BuildAndTestOVS.sh -d -g master -p none -t
 #
 # Build special version of ovs with patches --TODO
 #
@@ -89,16 +89,16 @@ echo "Cleanup temporary dirs"
 echo
 cd $BUILD_BASE
 
-if [ -d $TMPDIR ]
+if [ -d $TEMPDIR ]
 then
-    echo rm -rf $TMPDIR
-    rm -rf $TMPDIR
+    echo rm -rf $TEMPDIR
+    rm -rf $TEMPDIR
 fi
 
 # copy artifacts.
 
 if [[ "$JOB_NAME" =~ "daily" ]]; then
-    upload_artifacts.sh
+    $BUILD_BASE/../ci/upload_artifacts.sh
 fi
 
 if [ -d $TMP_RELEASE_DIR ]; then
@@ -112,6 +112,6 @@ fi
 # Destroy VM if one has been deployed. Also remove any local installation of
 # DPDK and OVS
 #
-sudo ../ci/clean.sh
+sudo $BUILD_BASE/../ci/clean.sh
 
 exit 0