diff options
| author |   Thomas F Herbert <therbert@redhat.com> | 2017-02-08 19:26:57 -0500 |
|---|---|---|
| committer | Thomas F Herbert <therbert@redhat.com> | 2017-02-11 08:39:47 -0500 |
| commit | 68444d67424763ad483df9c02732847e243c4887 (patch) | |
| tree | 235a96b19883d909233306cbf5dd20aaf6dd4424 /ci | |
| parent | 4bf728e6fcf73602c05eb7af5392b0ad18602183 (diff) | |
Build OVS 2.6 with DPDK 16.11
Get DPDK 16.11 from upstream.
Insure that NSH special build still works.
Change-Id: Iade3090ed6e80e9a7a62049a0b46af2a00e200fb
Signed-off-by: Thomas F Herbert <therbert@redhat.com>
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/buildovs.sh | 8 | ||||
| -rwxr-xr-x | ci/clean.sh | 14 |
2 files changed, 10 insertions, 12 deletions
diff --git a/ci/buildovs.sh b/ci/buildovs.sh index 5270f03..eefd380 100755 --- 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 @@ -89,10 +89,10 @@ 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. diff --git a/ci/clean.sh b/ci/clean.sh index 7dab0ea..48c648e 100755 --- a/ci/clean.sh +++ b/ci/clean.sh @@ -29,14 +29,12 @@ fi export BUILD_BASE=$WORKSPACE source $BUILD_BASE/../build/functions.sh - +cd $BUILD_BASE cleanrpms -set +e -rm -rf ovsrpm -rm -rf rpmbuild -rm -rf rpms -rm -rf build -rm *.rpm +rm -rf ovsrpm || true +rm -rf rpmbuild || true +rm -rf rpms || true +#rm -rf release || true +rm *.rpm || true ccache -C || true -set -e exit 0 |