diff options
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/build.sh | 1 | ||||
| -rwxr-xr-x | ci/buildovs.sh | 38 |
2 files changed, 20 insertions, 19 deletions
diff --git a/ci/build.sh b/ci/build.sh index c1655ad..2723abe 100755 --- a/ci/build.sh +++ b/ci/build.sh @@ -13,6 +13,7 @@ # 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 "Hello OVSNFV community!" diff --git a/ci/buildovs.sh b/ci/buildovs.sh index 1164733..fead8db 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 "===================================" @@ -52,10 +59,6 @@ export CACHE_DIR=$TOPDIR/cache export TMPDIR=$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 @@ -67,15 +70,12 @@ then 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 +BuildAndTestOVS.sh -d -g master -p none -t # # Build special version of ovs with patches --TODO # |