Skip to content

fix k8s-test & cleanup#762

Merged
jojimt merged 2 commits intocontiv:masterfrom
abhi:k8_typo
Mar 7, 2017
Merged

fix k8s-test & cleanup#762
jojimt merged 2 commits intocontiv:masterfrom
abhi:k8_typo

Conversation

@abhi
Copy link
Member

@abhi abhi commented Feb 27, 2017

The PR is follow up to #739

  1. Makefile changes that was missed from being committed as a part Fix for k8 and k8 sanity  #739 which was causing the test run on all the test cases.
  2. typo fix in the script to run k8 sanity.
    These are the only 2 minor fixes needed to run k8s sanity

New test case:

  1. contains fix for a new test case for bonded uplink to adapt to k8s,docker and swarm testing environments.

@unclejack
Copy link
Contributor

LGTM

@unclejack unclejack changed the title fixing typo fix k8s-test & cleanup Feb 27, 2017
DEFAULT_DOCKER_VERSION := 1.12.6
SHELL := /bin/bash
EXCLUDE_DIRS := bin docs Godeps scripts test vagrant vendor install
EXCLUDE_DIRS := bin docs Godeps scripts test vagrant vendor install
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's some trailing whitespace at the end of this line.

CONTIV_K8=1 cd vagrant/k8s/ && ./start_sanity_service.sh
cd $(GOPATH)/src/github.com/contiv/netplugin/scripts/python && PYTHONIOENCODING=utf-8 ./createcfg.py -scheduler 'k8'
CONTIV_K8=1 CONTIV_NODES=3 go test -v -timeout 540m ./test/systemtests -check.v -check.f "00SSH|Basic|Network|Policy|TestTrigger|ACIM|HostBridge|Netprofile"
CONTIV_K8=1 CONTIV_NODES=3 go test -v -timeout 540m ./test/systemtests -check.v -check.f "00SSH|TestBasic|TestNetwork|TestPolicy|TestTrigger"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's some trailing whitespace at the end of this line.

@jojimt
Copy link
Contributor

jojimt commented Mar 6, 2017

@abhinandanpb Pls rebase.

@unclejack
Copy link
Contributor

@jojimt: This still needs some more changes to be made and some other changes to be reverted. Some tests were failing the last time I've tried to run the tests. @abhinandanpb is already aware of those issues and he's working on those changes.

adding multiple uplinks
@abhi
Copy link
Member Author

abhi commented Mar 6, 2017

@jojimt done.

@jojimt jojimt merged commit 3005e7b into contiv:master Mar 7, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants