ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: Fix 3rd party CI systems.

Browse Source 
Commit https://gerrit.fd.io/r/#/c/15525/ breaks 3rd party CI jobs.

This suggests an alternative solution that supports both use cases.

Type: feature
Change-Id: I966210cf4594651735e6a8bffa32dd52b4539a13
Signed-off-by: Paul Vinciguerra <pvinci@vinciconsulting.com>
This commit is contained in:
Paul Vinciguerra
2018-10-26 05:55:18 -07:00
committed by Damjan Marion
parent d58419f19b
commit 86a9441c2c
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -635,10 +635,13 @@ ifeq ($(OS_ID),ubuntu)
@make vom-pkg-deb @make vom-pkg-deb
endif endif
MAKE_VERIFY_GATE_OS ?= ubuntu-18.04
verify: pkg-verify 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") $(call banner,"Testing vppapigen")
@src/tools/vppapigen/test_vppapigen.py @src/tools/vppapigen/test_vppapigen.py
$(call banner,"Running tests") $(call banner,"Running tests")
@make COMPRESS_FAILED_TEST_LOGS=yes RETRIES=3 test @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 endif