Merge pull request volcano-sh#307 from k82cn/e2e_test

Added e2e test by dind.
wangyuqing4 · Jul 24, 2018 · c9326dc · c9326dc
2 parents a7a75cb + fbad03b
commit c9326dc
Show file tree

Hide file tree

Showing 5 changed files with 1,720 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,22 +1,26 @@
 language: go
 
+sudo: required
+
+services:
+  - docker
+
 go:
   - "1.10"
 
 go_import_path: github.com/kubernetes-incubator/kube-arbitrator
 
 install:
   - go get -u github.com/golang/lint/golint
-  #  - ./hack/install-etcd.sh
 
 before_script:
   - export TEST_LOG_LEVEL=4
-  # - export PATH=`pwd`/third_party/etcd:${PATH}
 
 script:
   - make verify
   - make
   - make run-test
+  - make e2e
 
 notifications:
   webhooks: https://www.travisbuddy.com/

diff --git a/Makefile b/Makefile
@@ -29,6 +29,10 @@ images: kube-arbitrator
 run-test:
 	hack/make-rules/test.sh $(WHAT) $(TESTS)
 
+e2e: kube-arbitrator
+	hack/e2e-cluster.sh
+	cd test && go test -v
+
 coverage:
 	KUBE_COVER=y hack/make-rules/test.sh $(WHAT) $(TESTS)