diff options
author | 2016-09-27 07:57:04 +0800 | |
---|---|---|
committer | 2016-09-27 07:57:04 +0800 | |
commit | 9b6b8d276269cb1a36b7f78da4caa51106dff0ed (patch) | |
tree | 2ba905478ae0d5cb49ff9c57b4eb476a5affbbab /test/kubernetes_test.go | |
parent | 77947fd51afd10d339842211a56cab0706ee0358 (diff) | |
download | coredns-9b6b8d276269cb1a36b7f78da4caa51106dff0ed.tar.gz coredns-9b6b8d276269cb1a36b7f78da4caa51106dff0ed.tar.zst coredns-9b6b8d276269cb1a36b7f78da4caa51106dff0ed.zip |
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>
Diffstat (limited to 'test/kubernetes_test.go')
-rw-r--r-- | test/kubernetes_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/kubernetes_test.go b/test/kubernetes_test.go index 3ba2bfcd4..555df7791 100644 --- a/test/kubernetes_test.go +++ b/test/kubernetes_test.go @@ -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). |