X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=Makefile;h=7f5092b55703b3ada1fcf0caab0355bf97dafe29;hb=20b962d3e494513ab28854936cc8bbc32891686b;hp=1a11da8cedaf6bb381774e47f33af994f9896016;hpb=ea1a65135e01311e31e94b8d0ed0721c9856775d;p=vpp.git diff --git a/Makefile b/Makefile index 1a11da8ceda..7f5092b5570 100644 --- a/Makefile +++ b/Makefile @@ -68,7 +68,7 @@ DEB_DEPENDS += lcov chrpath autoconf indent clang-format libnuma-dev DEB_DEPENDS += python-all python3-all python3-setuptools python-dev DEB_DEPENDS += python-virtualenv python-pip libffi6 check DEB_DEPENDS += libboost-all-dev libffi-dev python3-ply libmbedtls-dev -DEB_DEPENDS += cmake ninja-build uuid-dev python3-jsonschema python3-yaml +DEB_DEPENDS += cmake ninja-build uuid-dev python3-jsonschema python3-yaml yamllint ifeq ($(OS_VERSION_ID),14.04) DEB_DEPENDS += libssl-dev else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-8) @@ -89,6 +89,7 @@ RPM_DEPENDS += selinux-policy selinux-policy-devel RPM_DEPENDS += ninja-build RPM_DEPENDS += libuuid-devel RPM_DEPENDS += mbedtls-devel +RPM_DEPENDS += yamllint ifeq ($(OS_ID),fedora) RPM_DEPENDS += dnf-utils @@ -558,6 +559,7 @@ cscope: cscope.files checkstyle: @build-root/scripts/checkstyle.sh + yamllint $(WS_ROOT)/src fixstyle: @build-root/scripts/checkstyle.sh --fix @@ -633,10 +635,13 @@ ifeq ($(OS_ID),ubuntu) @make vom-pkg-deb endif +MAKE_VERIFY_GATE_OS ?= ubuntu-18.04 verify: pkg-verify -ifeq ($(OS_ID)-$(OS_VERSION_ID),ubuntu-18.04) +ifeq ($(OS_ID)-$(OS_VERSION_ID),$(MAKE_VERIFY_GATE_OS)) $(call banner,"Testing vppapigen") @src/tools/vppapigen/test_vppapigen.py $(call banner,"Running tests") @make COMPRESS_FAILED_TEST_LOGS=yes RETRIES=3 test +else + $(call banner,"Skipping tests. Tests under 'make verify' supported on $(MAKE_VERIFY_GATE_OS)") endif