X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fscripts%2Fvpp%2Fbuild.sh;h=94aa13673d7ce0cefdbf3e067cbd031867bf402f;hb=refs%2Fchanges%2F93%2F34493%2F4;hp=34d16d4941ce3cbdf607ed4f1fd92400d1beb082;hpb=20c42f0391e535ab40a9ccb5f044808693a16cbb;p=ci-management.git

diff --git a/jjb/scripts/vpp/build.sh b/jjb/scripts/vpp/build.sh
index 34d16d494..94aa13673 100644
--- a/jjb/scripts/vpp/build.sh
+++ b/jjb/scripts/vpp/build.sh
@@ -60,6 +60,11 @@ make_build_test() {
         BUILD_ERROR="FAILED 'make install-ext-deps'"
         return
     fi
+    if [ -f extras/scripts/build_static_vppctl.sh ]; then
+	if ! extras/scripts/build_static_vppctl.sh ; then
+        BUILD_ERROR="FAILED 'extras/scripts/build_static_vppctl.sh'"
+	return
+    fi
     if ! make UNATTENDED=yes test-dep ; then
         BUILD_ERROR="FAILED 'make test-dep'"
         return
@@ -80,13 +85,13 @@ make_build_test() {
         echo "Testing VPP with automatically calculated number of cores. " \
              "See test logs for the exact number."
     fi
-    if [ "${OS_ID}-${OS_VERSION_ID}" == "${VPPAPIGEN_TEST_OS}" ] ; then
+    if grep -q "${OS_ID}-${OS_VERSION_ID}" <<< "${VPPAPIGEN_TEST_OS}"; then
         if ! src/tools/vppapigen/test_vppapigen.py ; then
             BUILD_ERROR="FAILED src/tools/vppapigen/test_vppapigen.py"
             return
         fi
     fi
-    if [ "${OS_ID}-${OS_VERSION_ID}" == "${MAKE_TEST_OS}" ] ; then
+    if grep -q "${OS_ID}-${OS_VERSION_ID}" <<< "${MAKE_TEST_OS}"; then
         if ! make COMPRESS_FAILED_TEST_LOGS=yes TEST_JOBS="$TEST_JOBS" RETRIES=3 test ; then
             BUILD_ERROR="FAILED 'make test'"
             return
@@ -94,7 +99,7 @@ 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}" ] ; then
+    if grep -q "${OS_ID}-${OS_VERSION_ID}" <<< "${MAKE_TEST_MULTIWORKER_OS}"; then
         if git grep -q VPP_WORKER_CONFIG ; then
             if ! make VPP_WORKER_CONFIG="workers 2" COMPRESS_FAILED_TEST_LOGS=yes \
                     RETRIES=3 TEST_JOBS="$TEST_JOBS" test ; then
@@ -116,6 +121,8 @@ make_build_test() {
         else
             echo "Skip running MULTIWORKER MAKE TEST on ${OS_ID}-${OS_VERSION_ID}"
         fi
+    else
+        echo "Skip running MULTIWORKER MAKE TEST on ${OS_ID}-${OS_VERSION_ID}"
     fi
 }