- 1611:
branch: '16.11.x'
repo-stream-part: 'deb_dpdk_1611'
+ - 1705:
+ branch: '17.05.x'
+ repo-stream-part: 'deb_dpdk_1705'
- job-template:
name: 'deb_dpdk-verify-{stream}-{os}'
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]
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
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 ]
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 ]
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:
- ../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: