Merge pull request #197 from linkernetworks/phstsai/fix-launch-bug

[Bug] VX-226 Fix the bug from changing the name in makefile.

.travis.yml

@@ -68,7 +68,7 @@ script:
   - JSONPATH='{range .items[*]}{@.metadata.name}:{range @.status.conditions[*]}{@.type}={@.status};{end}{end}'; until kubectl -n kube-system get pods -lname=tiller -o jsonpath="$JSONPATH" 2>&1 | grep -q "Ready=True"; do sleep 1; echo "wait the tiller to be available"; done
   - helm version
   # # Launch apps (mongodb, prometheus)
-  - make apps.launch-apps
+  - make apps.launch
   # # Check if prometheus is ready
   - until curl --connect-timeout 1 -sL -w "%{http_code}\\n" http://`kubectl get service -n vortex prometheus -o jsonpath="{.spec.clusterIP}"`:9090/api/v1/query?query=prometheus_build_info -o /dev/null | grep 200; do sleep 1; echo "wait the prometheus to be available"; kubectl get pods --all-namespaces; done
   - until [ `kubectl  -n vortex get --no-headers pods | awk '{c[$3]++}END{ print NR-c["Running"]}'` -eq 0 ]; do sleep 1; echo "wait all pod running"; kubectl -n vortex get pods;  done

Jenkinsfile

@@ -69,7 +69,7 @@
                         }
                         sh "make apps.init-helm 2>&1 | tee >(go-junit-report > report.xml)"
 	                    sh "JSONPATH='{range .items[*]}{@.metadata.name}:{range @.status.conditions[*]}{@.type}={@.status};{end}{end}'; until kubectl -n kube-system get pods -lname=tiller -o jsonpath=\"\$JSONPATH\" 2>&1 | grep -q \"Ready=True\"; do sleep 1; echo \"wait the tiller to be available\"; done"
-                        sh "make apps.launch-apps 2>&1 | tee >(go-junit-report > report.xml)"
+                        sh "make apps.launch 2>&1 | tee >(go-junit-report > report.xml)"
                         sh "until curl --connect-timeout 1 -sL -w \"%{http_code}\\n\" http://`kubectl get service -n vortex prometheus -o jsonpath=\"{.spec.clusterIP}\"`:9090/api/v1/query?query=prometheus_build_info -o /dev/null | grep 200; do sleep 1; echo \"wait the prometheus to be available\"; kubectl get pods --all-namespaces; done"
 
                         sh "make src.test-coverage-minikube 2>&1 | tee >(go-junit-report > report.xml)"

deploy/helm/README.md

@@ -24,7 +24,7 @@ make apps.init-helm
 ### Using helm deploy apps
 This will deploy mongodb and prometheus in your cluster
 ```
-make apps.launch-apps
+make apps.launch
 ```
 If you wnat to deploy certain chart, you can type
 ```