summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbuild/BuildAndTestOVS.sh18
-rwxr-xr-xbuild/test_ovs_rpm.sh133
-rwxr-xr-xci/clean.sh2
3 files changed, 1 insertions, 152 deletions
diff --git a/build/BuildAndTestOVS.sh b/build/BuildAndTestOVS.sh
index 0a5f357..57d2d2d 100755
--- a/build/BuildAndTestOVS.sh
+++ b/build/BuildAndTestOVS.sh
@@ -157,16 +157,7 @@ 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
@@ -184,16 +175,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
diff --git a/build/test_ovs_rpm.sh b/build/test_ovs_rpm.sh
deleted file mode 100755
index 6fff26a..0000000
--- a/build/test_ovs_rpm.sh
+++ /dev/null
@@ -1,133 +0,0 @@
-#!/bin/bash
-
-# 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 "==============================="
-echo "Requires sudo privileges"
-echo executing $0 $@
-echo executing on machine `uname -a`
-
-
-usage() {
- echo $0 [-d] [-k]
- echo -d -- Test with DPDK
- echo -k -- Load linux kernel module
-}
-
-function uninstallrpms() {
- cleanrpms
-}
-
-while getopts "dg:hkp:u:v" opt; do
- case "$opt" in
- d)
- DPDK="yes"
- ;;
- g)
- TAG=${OPTARG}
- ;;
- h|\?)
- usage
- exit 1
- ;;
- k)
- kmod="yes"
- ;;
- u)
- OVS_REPO_URL=${OPTARG}
- ;;
- v)
- verbose="yes"
- ;;
- esac
-done
-
-HOME=`pwd`
-TOPDIR=$HOME
-TMPDIR=$TOPDIR/ovsrpm
-
-BUILDDIR=$HOME
-source $BUILDDIR/functions.sh
-
-if [ -d $TMPDIR ]
-then
- rm -rf $TMPDIR
-fi
-
-mkdir -p $TMPDIR
-
-cd $TMPDIR
-
-mkdir -p $HOME/rpmbuild/RPMS/x86_64
-mkdir -p $HOME/rpmbuild/SOURCES
-mkdir -p $HOME/rpmbuild/SPECS
-mkdir -p $HOME/rpmbuild/SRPMS
-
-RPMDIR=$HOME/rpmbuild
-cp $HOME/*.rpm $RPMDIR/RPMS/x86_64
-
-function stopovs() {
- set +e
- /bin/systemctl is-active openvswitch.service
- if [ $? -eq 0 ]; then
- sudo /bin/systemctl stop openvswitch.service
- fi
- set -e
-}
-
-echo "-----------------------------------"
-echo "Clean old dpdk and ovs installations"
-echo
-stopovs
-cleanrpms
-
-if [ ! -z $DPDK ]; then
- if [ -z $DPDK_VERSION ]; then
- DPDK_VERSION=16.04.0
- fi
- echo "-----------------------------------"
- echo "Install DPDK RPMs for version $DPDK_VERSION"
- echo
- sudo rpm -ivh $RPMDIR/RPMS/x86_64/dpdk-${DPDK_VERSION:0:1}*.rpm
- sudo rpm -ivh $RPMDIR/RPMS/x86_64/dpdk-tools-${DPDK_VERSION:0:1}*.rpm
- sudo rpm -ivh $RPMDIR/RPMS/x86_64/dpdk-examples-${DPDK_VERSION:0:1}*.rpm
-fi
-
-if [ ! -z $kmod ]; then
- echo "-----------------------------------"
- echo "Test installation of kmod RPM"
- echo
- sudo rpm -ivh $RPMDIR/RPMS/x86_64/openvswitch-kmod*.rpm
-fi
-echo "-----------------------------------"
-echo "Test installation of user space RPM"
-echo
-sudo rpm -ivh $RPMDIR/RPMS/x86_64/openvswitch-2*.rpm
-
-echo "-----------------------------------"
-echo "Start openvswitch service."
-echo
-sudo service openvswitch start
-
-sudo ovs-vsctl show
-sudo ovs-vsctl add-br brtest
-sudo ovs-ofctl dump-flows brtest
-sudo ovs-vsctl del-br brtest
-sudo service openvswitch stop
-uninstallrpms
-
-exit 0
diff --git a/ci/clean.sh b/ci/clean.sh
index 367c61d..7dab0ea 100755
--- a/ci/clean.sh
+++ b/ci/clean.sh
@@ -37,6 +37,6 @@ rm -rf rpmbuild
rm -rf rpms
rm -rf build
rm *.rpm
-ccache -C
+ccache -C || true
set -e
exit 0