summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Vinciguerra <pvinci@vinciconsulting.com>2018-10-26 05:55:18 -0700
committerDamjan Marion <dmarion@me.com>2019-11-07 21:40:47 +0000
commit86a9441c2c477d6a4e6735276117e5dbca6c173c (patch)
tree2e8bf99dc98501a1cf99c9afe5f4d393575a2b47
parentd58419f19b33560d224471bc16674a525427308e (diff)
build: Fix 3rd party CI systems.
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>
-rw-r--r--Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index b8c8a781997..7f5092b5570 100644
--- a/Makefile
+++ b/Makefile
@@ -635,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