Allow to use Intel NICs for DPDK on Ericsson POD2

JIRA: FUEL-161

Change-Id: I009ba7e9587f3c47d8e609c96b0666394887929e
Signed-off-by: Michal Skalski <mskalski@mirantis.com>

diff --git a/build/Makefile b/build/Makefile
index f49947b..c4775a3 100644 (file)
--- a/build/Makefile
+++ b/build/Makefile
@@ -105,9 +105,8 @@ include cache.mk
 
 $(ISOCACHE):
        # Clone Fuel to non-persistent location and build
-       if [ ! -d /tmp/fuel-main ]; then \
-               cd /tmp && git clone $(FUEL_MAIN_REPO); \
-       fi
+       sudo rm -rf /tmp/fuel-main
+       cd /tmp && git clone $(FUEL_MAIN_REPO)
        cd /tmp/fuel-main && git checkout $(FUEL_MAIN_TAG)
        @echo "fuel" `git -C /tmp/fuel-main rev-parse HEAD` >> $(VERSION_FILE)
        # Remove Docker optimizations, otherwise multistrap will fail during
@@ -133,10 +132,9 @@ $(ISOCACHE):
        # OPNFV patches at Fuel build time
        # Need to be commited in order for them to be considered by the Fuel
        # build system
-       cd /tmp/fuel-main && git config user.name "Fuel OPNFV"
-       cd /tmp/fuel-main && git config user.email "fuel@opnfv.org"
        cd /tmp/fuel-main && git am $(TOPDIR)/bootstrap_admin_node.sh.patch
        cd /tmp/fuel-main && git am $(TOPDIR)/isolinux.cfg.patch
+       cd /tmp/fuel-main/build/repos/fuel-nailgun && git am $(TOPDIR)/Mark-Intel-82599-10-Gigabit-NIC-as-DPDK-capable.patch
        # Repeat build up to three times
        sudo -E ./fuel_build_loop
        cp /tmp/fuel-main/build/artifacts/fuel*.iso .

diff --git a/build/Mark-Intel-82599-10-Gigabit-NIC-as-DPDK-capable.patch b/build/Mark-Intel-82599-10-Gigabit-NIC-as-DPDK-capable.patch
new file mode 100644 (file)
index 0000000..d486f23
--- /dev/null
+++ b/build/Mark-Intel-82599-10-Gigabit-NIC-as-DPDK-capable.patch
@@ -0,0 +1,22 @@
+From: Fuel OPNFV <fuel@opnfv.org>
+Date: Wed, 3 Aug 2016 09:41:21 +0200
+Subject: [PATCH] Mark Intel 82599 10 Gigabit NIC as DPDK capable
+
+This NIC is used on Ericsson POD2 but Fuel doesn't allow to activate
+DPDK on it.
+---
+ nailgun/nailgun/fixtures/openstack.yaml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/nailgun/nailgun/fixtures/openstack.yaml b/nailgun/nailgun/fixtures/openstack.yaml
+index 74fa509..d08a4fc 100644
+--- a/nailgun/nailgun/fixtures/openstack.yaml
++++ b/nailgun/nailgun/fixtures/openstack.yaml
+@@ -2215,3 +2215,3 @@
+           "14e4:163f", "14e4:168d", "14e4:16a1", "14e4:16a2", "14e4:16ad",
+-          "14e4:16ae", "14e4:163e", "14e4:16a4"
++          "14e4:16ae", "14e4:163e", "14e4:16a4", "8086:10f8"
+         ]
+-- 
+1.9.1
+

diff --git a/build/config.mk b/build/config.mk
index e3766a7..f78043e 100644 (file)
--- a/build/config.mk
+++ b/build/config.mk
@@ -28,6 +28,10 @@ export NETWORKCHECKER_COMMIT?=fcb47dd095a76288aacf924de574e39709e1f3ca
 export FUELUPGRADE_COMMIT?=c1c4bac6a467145ac4fac73e4a7dd2b00380ecfb
 export FUEL_UI_COMMIT?=90de7ef4477230cb7335453ed26ed4306ca6f04f
 
+# for the patches applying purposes
+export GIT_COMMITTER_NAME?=Fuel OPNFV
+export GIT_COMMITTER_EMAIL?=fuel@opnfv.org
+
 DOCKER_REPO := http://get.docker.com/builds/Linux/x86_64
 DOCKER_TAG := docker-latest
 

diff --git a/build/fuel_build_loop b/build/fuel_build_loop
index 4a0dda6..324f28c 100755 (executable)
--- a/build/fuel_build_loop
+++ b/build/fuel_build_loop
@@ -20,7 +20,6 @@ do
     cnt=$[cnt + 1]
     echo -e "\n\n\n*** Starting build attempt # $cnt"
     cd /tmp/fuel-main
-    make clean
     make iso
     rc=$?
     if [ $rc -ne 0 ]; then