X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Fbuildovs.sh;h=eefd38015d4bab385e9f130b8a7cffb406f3d48b;hb=68444d67424763ad483df9c02732847e243c4887;hp=116473336301eab445bdea4e0c50ff15fce69245;hpb=8c3385a7f73731316c70f976d45c0e962651f374;p=ovsnfv.git

diff --git a/ci/buildovs.sh b/ci/buildovs.sh
index 1164733..eefd380 100755
--- a/ci/buildovs.sh
+++ b/ci/buildovs.sh
@@ -1,12 +1,19 @@
 #!/bin/bash
-##############################################################################
-# Copyright (c) 2015,2016 Red Hat Inc. and others.
-# therbert@redhat.com
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
+
+# Copyright (c) 2016 Open Platform for NFV Project, Inc. and its contributors
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
 set -e
 
 echo "==================================="
@@ -49,13 +56,9 @@ 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
 
-echo "--------------------------------------------------"
-echo "Build OVS RPM from upstream git $TAG"
-echo
-
 mkdir -p $RPMDIR/RPMS
 mkdir -p $RPMDIR/SOURCES
 mkdir -p $RPMDIR/SPECS
@@ -66,16 +69,13 @@ then
     mkdir -p $TMP_RELEASE_DIR
 fi
 
-#
-# Build ovs rpm without DPDK from ovs master
-#
-echo =======Build ovs rpm and ovs kmod rpm without DPDK Test in VM==========
-    BuildAndTestOVS.sh -p none -t
 #
 # Build ovs rpm with DPDK
 #
-echo =======Build ovs rpm with DPDK Test in VM==========
-BuildAndTestOVS.sh -d -p none -t
+echo =============================================
+echo =======Build ovs rpm with DPDK and test in VM.
+echo
+$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