Change-Id: I5143fab3b20beee3741bccc5c18032b4fdbc30ef
Signed-off-by: Peter Mikus <pmikus@cisco.com>
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,
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 make pkg-verify.
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
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 \"make build-root/vagrant/build.sh\""
- [ "x${DRYRUN}" == "xTrue" ] || make UNATTENDED=yes install-dep
- [ "x${DRYRUN}" == "xTrue" ] || make UNATTENDED=yes dpdk-install-dev
- [ "x${DRYRUN}" == "xTrue" ] || build-root/vagrant/build.sh
+ echo "Building using \"make pkg-verify\""
+ [ "x${DRYRUN}" == "xTrue" ] || make UNATTENDED=yes pkg-verify
fi
if [ "x${VPP_REPO}" == "x1" ]; then
fi
if [ "x${VPP_REPO}" == "x1" ]; then
- shell:
!include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh
- shell:
- shell:
!include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh
- shell:
- !include-raw-escape:
- - include-raw-vpp-csit-device.sh
-
+ !include-raw-escape: ../scripts/setup_vpp_dpdk_dev_env.sh
+ - shell:
+ !include-raw-escape: include-raw-vpp-csit-device.sh
publishers:
- robot-report:
publishers:
- robot-report:
- shell:
!include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh
- shell:
- shell:
!include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh
- shell:
- !include-raw-escape:
- - include-raw-vpp-csit-perf.sh
+ !include-raw-escape: ../scripts/setup_vpp_dpdk_dev_env.sh
+ - shell:
+ !include-raw-escape: include-raw-vpp-csit-perf.sh
publishers:
- robot-report:
publishers:
- robot-report: