From f70b56deb3b825cdf69ab1d506fe37aa037fe9cf Mon Sep 17 00:00:00 2001
From: Peter Mikus <pmikus@cisco.com>
Date: Fri, 16 Jun 2017 10:04:12 +0200
Subject: [PATCH] CSIT-682 Usage of make-verify for vpp-csit-verify jobs

Solve DPDK dependency in vpp-csit-verify* jobs, so that every time
vpp-csit-verify* is triggered the latest DPDK is build and used. This
patch will allows us to verify latest DPDK changes and be able to link
dpdk-plugin dependencies. It suppose the remove the dependency of
upgrading DPDK_DEV manually in CSIT branch.

Change-Id: Id560e4798ae9261bc98497a1ffb211b39131d0e3
Signed-off-by: Peter Mikus <pmikus@cisco.com>
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
---
 jjb/scripts/setup_vpp_dpdk_dev_env.sh       | 1 +
 jjb/vpp/include-raw-vpp-build.sh            | 7 ++++---
 jjb/vpp/include-raw-vpp-csit-functional.sh  | 7 +++++++
 jjb/vpp/include-raw-vpp-csit-verify-perf.sh | 7 +++++++
 jjb/vpp/vpp.yaml                            | 9 ++++++---
 5 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/jjb/scripts/setup_vpp_dpdk_dev_env.sh b/jjb/scripts/setup_vpp_dpdk_dev_env.sh
index cfb99615e..f36bcaad8 100644
--- a/jjb/scripts/setup_vpp_dpdk_dev_env.sh
+++ b/jjb/scripts/setup_vpp_dpdk_dev_env.sh
@@ -26,6 +26,7 @@ function setup {
             echo "deb ${REPO_URL} ./" | sudo tee /etc/apt/sources.list.d/99fd.io.list
             sudo apt-get update || true
             sudo apt-get -y --force-yes install vpp-dpdk-dev || true
+            sudo apt-get -y --force-yes install vpp-dpdk-dkms || true
         elif [[ $DISTRIB_ID == "CentOS" ]]; then
             sudo cat << EOF > fdio-master.repo
 [fdio-master]
diff --git a/jjb/vpp/include-raw-vpp-build.sh b/jjb/vpp/include-raw-vpp-build.sh
index b51b41a32..5e603d216 100644
--- a/jjb/vpp/include-raw-vpp-build.sh
+++ b/jjb/vpp/include-raw-vpp-build.sh
@@ -32,15 +32,16 @@ echo "CC=${CC}"
 echo "IS_CSIT_VPP_JOB=${IS_CSIT_VPP_JOB}"
 # If and only if we are doing verify *after* make verify was made to work
 # and we are not a CSIT job just building packages, then use make verify,
-# else use the old build-root/vagrant/build.sh
+# else use the old extras/vagrant/build.sh
 if (git log --oneline | grep 37682e1 > /dev/null 2>&1) && \
         [ "x${IS_CSIT_VPP_JOB}" != "xTrue" ]
 then
     echo "Building using \"make verify\""
     [ "x${DRYRUN}" == "xTrue" ] || make UNATTENDED=yes verify
 else
-    echo "Building using \"build-root/vagrant/build.sh\""
-    [ "x${DRYRUN}" == "xTrue" ] || build-root/vagrant/build.sh
+    echo "Building using \"make extras/vagrant/build.sh\""
+    [ "x${DRYRUN}" == "xTrue" ] || make UNATTENDED=yes dpdk-install-dev
+    [ "x${DRYRUN}" == "xTrue" ] || extras/vagrant/build.sh
 fi
 
 if [ "x${VPP_REPO}" == "x1" ]; then
diff --git a/jjb/vpp/include-raw-vpp-csit-functional.sh b/jjb/vpp/include-raw-vpp-csit-functional.sh
index 33eef0f38..38ef7e08e 100644
--- a/jjb/vpp/include-raw-vpp-csit-functional.sh
+++ b/jjb/vpp/include-raw-vpp-csit-functional.sh
@@ -18,6 +18,13 @@ if [ $? != 0 ]; then
 fi
 
 cp build-root/*.deb csit/
+if [ -e dpdk/vpp-dpdk-dkms*.deb ]
+then
+    cp dpdk/vpp-dpdk-dkms*.deb csit/
+else
+    cp /var/cache/apt/archives/vpp-dpdk-dkms*.deb csit/
+fi
+
 cd csit
 # execute csit bootstrap script if it exists
 if [ -e bootstrap.sh ]
diff --git a/jjb/vpp/include-raw-vpp-csit-verify-perf.sh b/jjb/vpp/include-raw-vpp-csit-verify-perf.sh
index b601137b0..4a7480ae1 100644
--- a/jjb/vpp/include-raw-vpp-csit-verify-perf.sh
+++ b/jjb/vpp/include-raw-vpp-csit-verify-perf.sh
@@ -23,6 +23,13 @@ if [ $? != 0 ]; then
 fi
 
 cp build-root/*.deb csit/
+if [ -e dpdk/vpp-dpdk-dkms*.deb ]
+then
+    cp dpdk/vpp-dpdk-dkms*.deb csit/
+else
+    cp /var/cache/apt/archives/vpp-dpdk-dkms*.deb csit/
+fi
+
 cd csit
 # execute csit bootstrap script if it exists
 if [ ! -e bootstrap-verify-perf.sh ]
diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index a4e7c7d31..f936158c3 100644
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -311,13 +311,15 @@
 
     builders:
         - shell:
-            !include-raw-escape: include-raw-vpp-checkstyle.sh
+            !include-raw-escape:
+                - include-raw-vpp-checkstyle.sh
         - shell:
             !include-raw-escape:
                 - ../scripts/setup_vpp_dpdk_dev_env.sh
                 - include-raw-vpp-build.sh
         - shell:
-            !include-raw-escape: include-raw-vpp-csit-functional.sh
+            !include-raw-escape:
+                - include-raw-vpp-csit-functional.sh
 
     publishers:
         - archive-artifacts:
@@ -399,7 +401,8 @@
                 - ../scripts/setup_vpp_dpdk_dev_env.sh
                 - include-raw-vpp-build.sh
         - shell:
-            !include-raw-escape: include-raw-vpp-csit-verify-perf.sh
+            !include-raw-escape:
+                - include-raw-vpp-csit-verify-perf.sh
 
     publishers:
         - archive-artifacts:
-- 
2.16.6