build: Fix 3rd party CI systems. 56/15556/4
authorPaul Vinciguerra <pvinci@vinciconsulting.com>
Fri, 26 Oct 2018 12:55:18 +0000 (05:55 -0700)
committerDamjan Marion <dmarion@me.com>
Thu, 7 Nov 2019 21:40:47 +0000 (21:40 +0000)
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>
Makefile

index b8c8a78..7f5092b 100644 (file)
--- 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