Cleanup Makefile and .travis.yml (#305)

This fix updates .travis.yml and Makefile for several places:
- Remove unneeded `docker pull gcr.io/google_containers/hyperkube-amd64:v1.2.4` (only v1.3.7 was used)
- Use docker to deploy etcd (insteadof downloading etcd binary).
- Merge `make testk8s` and `make testk8s-setup` (no need to have multiple targets for a couple of tests)
- Set version of etcd and kubernetes in .travis.yml (so that it is easy to update new version in the future)

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
This commit is contained in:
Yong Tang 2016-09-27 07:57:04 +08:00 committed by GitHub
parent 77947fd51a
commit 9b6b8d2762
4 changed files with 15 additions and 31 deletions

View file

@ -63,7 +63,7 @@ var testdataLookupSRV = []struct {
{"*.*.coredns.local.", 1, 1}, // One SRV record, via namespace and service wildcard
}
func TestK8sIntegration(t *testing.T) {
func TestKubernetesIntegration(t *testing.T) {
// t.Skip("Skip Kubernetes Integration tests")
// subtests here (Go 1.7 feature).