Synch stable/brahmaputra with master

Several commits over recent months have not been cherry-picked to
stable/brahmaputra. As some of these have affected gerrit ci a set of
intermediate patches will not pass gerrit ci. So this is a merge commit
of the outstanding patches that need to be cherry-picked and brings
stable/b to be identical to master commit
4e07dd488cb78b8333763418c4ccc25e05766956 Tue May 10 18:31:20 2016 -0400
"Fix for new location of OVS and DPDK COPR repos."

The patches merged into this patch are:
        0001-Build-OVS-with-dpdk.patch
        0002-Fix-pathname-to-script.patch
        0003-Fix-uploading-of-files-and-remove-date-from-file-nam.patch
        0004-OVS-Archive-file-name-changed.patch
        0005-Fixes-RPM-build-problem.-Use-correct-copr-repo.-Fix-.patch
        0006-Fixed-base-name-of-intermediate-tarball-name.patch
        0007-Fix-build-problem-by-freezing-copr-commits.patch
        0008-fuel-plugin-Pick-updated-libpcre-packages.patch
        0009-Fix-for-new-location-of-OVS-and-DPDK-COPR-repos.patch

Plus final manual changes (add ci/clean.sh) to bring stable brahmaputra
identical to master.

Change-Id: e7ac7b4cb358b907b8756c4b95cc6b6618a76913
Signed-off-by: Billy O'Mahony <billy.o.mahony@intel.com>
Signed-off-by: Tom Herbert <therbert@redhat.com>
Reviewed-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
Reviewed-by: Mark D. Gray <mark.d.gray@intel.com>

Build OVS with dpdk

Builds OVS with DPDK. Uses dpdk 2.2.0 and Open vSwitch 2.5.
Includes Multi-Queue and recent patches.
Open vSwitch RPM is now built with DPDK dataplane.
Upstream copr (Fedora) spec files and patches are used for building.

Also includes fixes of RPM building and command line options.
Adds dpdk arg to RPM test script.

Use "pure" COPR spec files without modifications. Fixed some function problems.
Addressed reviewer comments. Delete local copies of spec files
Build dpdk snapshot instead of using upstream snapshot.
Fix clean script.

"stack" VM with its default configuration doesn't support sse3 instruction set
required by DPDK.  Include workaround to test RPM script in host instead of VM.

Install prereqs for dpdk build.
Use 'set -e' in all scripts for error termination.
Add PyQt4 Pre-req.
Move functions and respond to reviewers comments.

Change-Id: I8d5892ff61a814271972e8d2279628d645b2831b
Signed-off-by: Thomas F Herbert <therbert@redhat.com>
Conflicts:
	build/BuildAndTestOVS.sh
	build/build_ovs_rpm.sh
	build/config
	build/instack_ovs.sh
	build/test_ovs_rpm.sh
	ci/buildovs.sh

Fix pathname to script. This patch fixes bug that is currently blocking the daily build.

Change-Id: If3624ea4e93bc42c5fe633b0c30d506f2b70efd0
Signed-off-by: Thomas F Herbert <therbert@redhat.com>

Fix uploading of files and remove date from file name

Change-Id: I33c3c1bbb5c9e7cd45e693de2db3230887cde7da
Signed-off-by: Thomas F Herbert <therbert@redhat.com>

OVS Archive file name changed. Change message to call archive snapshot

Change-Id: Ia07f6e38e2108f061dd616aa393cd4d98d7e8f11
Signed-off-by: Thomas F Herbert <therbert@redhat.com>

Fixes RPM build problem. Use correct copr repo. Fix some version number parsing and tarball and rpm naming that was specific to old repo and old DPDK version. Now supports DPDK 16.04-rc4.

Change-Id: Ia64b38d676e945df27917f4d9aa90ba4872c8cb5
Signed-off-by: Thomas F Herbert <therbert@redhat.com>

Fixed base name of intermediate tarball name.

Change-Id: I23e60800e83f216474328c461a2ac7aff453412f
Signed-off-by: Thomas F Herbert <therbert@redhat.com>

Fix build problem by freezing copr commits Use correct variable for copr dpdk version

Change-Id: I09c5e7060924771a75376aebe5bf3bde897c38eb
Signed-off-by: Thomas F Herbert <therbert@redhat.com>

fuel plugin: Pick updated libpcre packages.

Account for changes in SR3 iso that caused the plugin deploy to fail
when it tried to downgrade libpcre packages.

Change-Id: I6a11fc2e887a76cf879b1c1a398784da691b8329
Signed-off-by: Billy O'Mahony <billy.o.mahony@intel.com>
Reviewed-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
Reviewed-by: Mark D. Gray <mark.d.gray@intel.com>
Reviewed-by: Tom Herbert <therbert@redhat.com>
Reviewed-by: Michal Skalski <mskalski@mirantis.com>

Fix for new location of OVS and DPDK COPR repos.

Change-Id: Ibee81cbee778bb1b542317ed41b94d01f86426bc
Signed-off-by: Thomas F Herbert <therbert@redhat.com>

Final manual changes to bring stable/brahmaputra into line with master.

Signed-off-by: Billy O'Mahony <billy.o.mahony@intel.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/fuel-plugin-ovsnfv/ovs_package/ubuntu/dependencies.txt b/fuel-plugin-ovsnfv/ovs_package/ubuntu/dependencies.txt
index 77188cf..08c6782 100644
--- a/fuel-plugin-ovsnfv/ovs_package/ubuntu/dependencies.txt
+++ b/fuel-plugin-ovsnfv/ovs_package/ubuntu/dependencies.txt
@@ -2,14 +2,14 @@ http://archive.ubuntu.com/ubuntu/pool/main/a/autoconf/autoconf_2.69-6_all.deb
 http://archive.ubuntu.com/ubuntu/pool/main/a/automake-1.14/automake_1.14.1-2ubuntu1_all.deb
 http://archive.ubuntu.com/ubuntu/pool/main/a/autotools-dev/autotools-dev_20130810.1_all.deb
 http://archive.ubuntu.com/ubuntu/pool/main/m/m4/m4_1.4.17-4_amd64.deb
-http://archive.ubuntu.com/ubuntu/pool/main/p/pcre3/libpcre3_8.31-2ubuntu2.2_amd64.deb
+http://archive.ubuntu.com/ubuntu/pool/main/p/pcre3/libpcre3_8.31-2ubuntu2.3_amd64.deb
 http://archive.ubuntu.com/ubuntu/pool/main/libs/libselinux/libselinux1_2.2.2-1ubuntu0.1_amd64.deb
 http://archive.ubuntu.com/ubuntu/pool/main/libs/libsepol/libsepol1_2.2-1ubuntu0.1_amd64.deb
 http://archive.ubuntu.com/ubuntu/pool/main/f/fuse/fuse_2.9.2-4ubuntu4.14.04.1_amd64.deb
 http://archive.ubuntu.com/ubuntu/pool/main/f/fuse/libfuse2_2.9.2-4ubuntu4.14.04.1_amd64.deb
-http://archive.ubuntu.com/ubuntu/pool/main/p/pcre3/libpcrecpp0_8.31-2ubuntu2.2_amd64.deb
+http://archive.ubuntu.com/ubuntu/pool/main/p/pcre3/libpcrecpp0_8.31-2ubuntu2.3_amd64.deb
 http://archive.ubuntu.com/ubuntu/pool/main/libs/libsepol/libsepol1-dev_2.2-1ubuntu0.1_amd64.deb
-http://archive.ubuntu.com/ubuntu/pool/main/p/pcre3/libpcre3-dev_8.31-2ubuntu2.2_amd64.deb
+http://archive.ubuntu.com/ubuntu/pool/main/p/pcre3/libpcre3-dev_8.31-2ubuntu2.3_amd64.deb
 http://archive.ubuntu.com/ubuntu/pool/main/libs/libselinux/libselinux1-dev_2.2.2-1ubuntu0.1_amd64.deb
 http://archive.ubuntu.com/ubuntu/pool/main/f/fuse/libfuse-dev_2.9.2-4ubuntu4.14.04.1_amd64.deb
 http://archive.ubuntu.com/ubuntu/pool/main/libt/libtool/libltdl-dev_2.4.2-1.7ubuntu1_amd64.deb