Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP system tests improvements #933

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

WIP system tests improvements #933

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
896d954
Makefile: add L3 system tests to env var
unclejack Jul 27, 2017
298ffff
Makefile: add Service to the system tests target
unclejack Oct 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,10 @@ 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"

all: build unit-test system-test ubuntu-tests

Expand Down Expand Up @@ -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
Expand Down