From 3be6758cc8172055a1fe5e74d6f74e75848b7a6d Mon Sep 17 00:00:00 2001 From: Andrew Yourtchenko Date: Fri, 12 Feb 2021 13:36:07 +0000 Subject: vpp: enable multi-worker make test on Debian10 This patch enables the multi-worker make test on the branches that support it, as a voting job directly, to capture the working tests and avoid the new non-working multiworker testcases. Change-Id: Ibeedd8f8aa2851c022b045d37505bb75bf460de8 Signed-off-by: Andrew Yourtchenko --- jjb/scripts/vpp/build.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'jjb') diff --git a/jjb/scripts/vpp/build.sh b/jjb/scripts/vpp/build.sh index 76aab8aa4..bfeaacea9 100644 --- a/jjb/scripts/vpp/build.sh +++ b/jjb/scripts/vpp/build.sh @@ -34,6 +34,7 @@ IS_CSIT_VPP_JOB="${IS_CSIT_VPP_JOB:-}" MAKE_PARALLEL_FLAGS="${MAKE_PARALLEL_FLAGS:-}" MAKE_PARALLEL_JOBS="${MAKE_PARALLEL_JOBS:-}" MAKE_TEST_OS="${MAKE_TEST_OS:-ubuntu-18.04}" +MAKE_TEST_MULTIWORKER_OS="${MAKE_TEST_MULTIWORKER_OS:-debian-10}" VPPAPIGEN_TEST_OS="${VPPAPIGEN_TEST_OS:-${MAKE_TEST_OS}}" BUILD_RESULT="SUCCESSFULLY COMPLETED" BUILD_ERROR="" @@ -104,6 +105,16 @@ make_build_test() { else echo "Skip running 'make test' on ${OS_ID}-${OS_VERSION_ID}" fi + if [ "${OS_ID}-${OS_VERSION_ID}" == "${MAKE_TEST_MULTIWORKER_OS}" ] && git grep VPP_WORKER_CONFIG; then + if ! make VPP_WORKER_CONFIG="workers 2" COMPRESS_FAILED_TEST_LOGS=yes RETRIES=3 test; then + BUILD_ERROR="FAILED 'make test' with VPP_WORKER_CONFIG='workers 2'" + return + else + echo -e "\n* VPP ${OS_ID^^}-${OS_VERSION_ID}-${OS_ARCH^^} MULTIWORKER MAKE TEST SUCCESSFULLY COMPLETED\n" + fi + else + echo "Skip running 'make test' with VPP_WORKER_CONFIG='workers 2' on ${OS_ID}-${OS_VERSION_ID}" + fi } if [ "${DRYRUN,,}" != "true" ] ; then -- cgit 1.2.3-korg