From 896d95410e3241b8198abe842bd6d4cb6aed4ead Mon Sep 17 00:00:00 2001 From: unclejack Date: Thu, 27 Jul 2017 15:42:28 +0300 Subject: [PATCH 1/2] Makefile: add L3 system tests to env var Signed-off-by: Cristian Staretu --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 1365bca49..e4a00a181 100755 --- a/Makefile +++ b/Makefile @@ -29,6 +29,7 @@ CI_HOST_TARGETS ?= "host-unit-test host-integ-test host-build-docker-image" SYSTEM_TESTS_TO_RUN ?= "00SSH|Basic|Network|Policy|TestTrigger|ACIM|Netprofile" K8S_SYSTEM_TESTS_TO_RUN ?= "00SSH|Basic|Network|Policy" ACI_GW_IMAGE ?= "contiv/aci-gw:04-12-2017.2.2_1n" +L3_SYSTEM_TESTS_TO_RUN ?= "00SSH|Basic|Service|Bgp|Network|Policy|TestTrigger|ACIM|Netprofile" all: build unit-test system-test ubuntu-tests @@ -223,7 +224,7 @@ system-test:start l3-test: CONTIV_L3=2 CONTIV_NODES=3 make stop start ssh-build cd $(GOPATH)/src/github.com/contiv/netplugin/scripts/python && PYTHONIOENCODING=utf-8 ./createcfg.py -contiv_l3 2 - CONTIV_L3=2 CONTIV_NODES=3 go test -v -timeout 900m ./test/systemtests -check.v -check.abort + CONTIV_L3=2 CONTIV_NODES=3 go test -v -timeout 900m ./test/systemtests -check.v -check.abort -check.f $(L3_SYSTEM_TESTS_TO_RUN) CONTIV_L3=2 CONTIV_NODES=3 make stop #l3-demo setup for docker/swarm From 298ffff10d27fe56b465b46ac9f262debe6046cf Mon Sep 17 00:00:00 2001 From: unclejack Date: Sat, 14 Oct 2017 14:30:28 +0300 Subject: [PATCH 2/2] Makefile: add Service to the system tests target Signed-off-by: Cristian Staretu --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e4a00a181..6457066e8 100755 --- a/Makefile +++ b/Makefile @@ -26,7 +26,7 @@ GOLINT_CMD := golint -set_exit_status GOFMT_CMD := gofmt -s -l GOVET_CMD := go tool vet CI_HOST_TARGETS ?= "host-unit-test host-integ-test host-build-docker-image" -SYSTEM_TESTS_TO_RUN ?= "00SSH|Basic|Network|Policy|TestTrigger|ACIM|Netprofile" +SYSTEM_TESTS_TO_RUN ?= "00SSH|Basic|Service|Network|Policy|TestTrigger|ACIM|Netprofile" K8S_SYSTEM_TESTS_TO_RUN ?= "00SSH|Basic|Network|Policy" ACI_GW_IMAGE ?= "contiv/aci-gw:04-12-2017.2.2_1n" L3_SYSTEM_TESTS_TO_RUN ?= "00SSH|Basic|Service|Bgp|Network|Policy|TestTrigger|ACIM|Netprofile"