Fix tests with bx auth

README-ko.md

@@ -1,4 +1,6 @@
 [![Build Status](https://travis-ci.org/IBM/spring-boot-microservices-on-kubernetes.svg?branch=master)](https://travis-ci.org/IBM/spring-boot-microservices-on-kubernetes)
+![Bluemix Deployments](https://metrics-tracker.mybluemix.net/stats/13404bda8d87a6eca2c5297511ae9a5e/badge.svg)
+
 # 쿠버네티스에 자바 Spring Boot 애플리케이션 빌드 및 배포하기
 
 *Read this in other languages: [English](README.md).*
@@ -22,7 +24,7 @@ Office Spacee 앱을 직접 블루믹스에 배포하려면, 'Deploy to Bluemix'
 
 > 먼저 쿠버네티스 클러스터를 생성해야 합니다. 블루믹스 계정에 완전히 배포되었는지 확인하신 후에 진행하십시오.
 
-[![Create Toolchain](https://github.com/IBM/container-journey-template/blob/master/images/button.png)](https://console.ng.bluemix.net/devops/setup/deploy/)
+[![Create Toolchain](https://metrics-tracker.mybluemix.net/stats/13404bda8d87a6eca2c5297511ae9a5e/button.svg)](https://console.ng.bluemix.net/devops/setup/deploy/)
 
 툴체인과 파이프라인을 생성하려면 [Toolchain instructions](https://github.com/IBM/container-journey-template/blob/master/Toolchain_Instructions.md)을 참조하십시오.
 
@@ -100,7 +102,7 @@ Spring Boot 애플리케이션들을 수정하려면 Java 프로젝트와 닥커
 
 Spring Boot 마이크로서비스는 **Compute-Interest-API** 와 **Send-Notification** 입니다.
 
-**Compute-Interest-API**은 MySQL 데이터베이스를 사용하기위해 구성된 Spring Boot 앱입니다. 관련한 구성은 `spring.datasource.*`에 있는 application.properties에 위치해 있습니다. 
+**Compute-Interest-API**은 MySQL 데이터베이스를 사용하기위해 구성된 Spring Boot 앱입니다. 관련한 구성은 `spring.datasource.*`에 있는 application.properties에 위치해 있습니다.
 
 *compute-interest-api/src/main/resources/application.properties*
 ```

README.md

@@ -1,4 +1,6 @@
 [![Build Status](https://travis-ci.org/IBM/spring-boot-microservices-on-kubernetes.svg?branch=master)](https://travis-ci.org/IBM/spring-boot-microservices-on-kubernetes)
+![Bluemix Deployments](https://metrics-tracker.mybluemix.net/stats/13404bda8d87a6eca2c5297511ae9a5e/badge.svg)
+
 # Build and deploy Java Spring Boot microservices on Kubernetes
 
 *Read this in other languages: [한국어](README-ko.md).*
@@ -20,7 +22,7 @@ If you want to deploy the Office Space app directly to Bluemix, click on 'Deploy
 
 > You will need to create your Kubernetes cluster first and make sure it is fully deployed in your Bluemix account.
 
-[![Create Toolchain](https://github.com/IBM/container-journey-template/blob/master/images/button.png)](https://console.ng.bluemix.net/devops/setup/deploy/)
+[![Create Toolchain](https://metrics-tracker.mybluemix.net/stats/13404bda8d87a6eca2c5297511ae9a5e/button.svg)](https://console.ng.bluemix.net/devops/setup/deploy/)
 
 Please follow the [Toolchain instructions](https://github.com/IBM/container-journey-template/blob/master/Toolchain_Instructions.md) to complete your toolchain and pipeline.
 
@@ -367,3 +369,17 @@ account-summary 10.10.10.74 <nodes> 80:30080/TCP
 
 ## License
 [Apache 2.0](http://www.apache.org/licenses/LICENSE-2.0)
+
+# Privacy Notice
+
+Sample Kubernetes Yaml file that includes this package may be configured to track deployments to [IBM Bluemix](https://www.bluemix.net/) and other Kubernetes platforms. The following information is sent to a [Deployment Tracker](https://github.com/IBM/metrics-collector-service) service on each deployment:
+
+* Kubernetes Cluster Provider(`Bluemix,Minikube,etc`)
+* Kubernetes Machine ID (`MachineID`)
+* Environment variables in this Kubernetes Job.
+
+This data is collected from the Kubernetes Job in the sample application's yaml file. This data is used by IBM to track metrics around deployments of sample applications to IBM Bluemix to measure the usefulness of our examples so that we can continuously improve the content we offer to you. Only deployments of sample applications that include code to ping the Deployment Tracker service will be tracked.
+
+## Disabling Deployment Tracking
+
+Please comment out/remove the Kubernetes Job portion at the end of the `account-summary.yaml` file.

account-summary.yaml

@@ -59,3 +59,24 @@ spec:
  ports:
  - containerPort: 80
  name: web
+---
+apiVersion: batch/v1
+kind: Job
+metadata: {name: spring-boot-microservices-on-kubernetes-metrics}
+spec:
+ template:
+ metadata: {name: spring-boot-microservices-on-kubernetes-metrics}
+ spec:
+ containers:
+ - env:
+ - {name: config, value: '{"repository_id":
+ "spring-boot-microservices-on-kubernetes",
+ "target_runtimes": ["Kubernetes Cluster", "OpenWhisk"],
+ "target_services": ["Compose for MySQL"],
+ "event_id": "web", "event_organizer": "dev-journeys"}'}
+ image: journeycode/kubernetes:latest
+ imagePullPolicy: Always
+ name: spring-boot-microservices-on-kubernetes-metrics
+ resources:
+ limits: {cpu: 100m}
+ restartPolicy: Never

scripts/bx_auth.sh

@@ -3,8 +3,8 @@
 BLUEMIX_ORG="Developer Advocacy"
 BLUEMIX_SPACE="dev"
 
-if [[ -z "$BLUEMIX_AUTH" ]]; then
- echo -e "\033[0;33mFork detected; not authenticating to Bluemix.\033[0m"
+if [[ "$TRAVIS_PULL_REQUEST" != "false" ]]; then
+ echo -e "\033[0;33mPull Request detected; not authenticating to Bluemix.\033[0m"
  exit 0
 fi
 

scripts/install_bx.sh

@@ -1,6 +1,6 @@
 #!/bin/bash -e
 
-if [[ -z "$BLUEMIX_AUTH" ]]; then
+if [[ "$TRAVIS_PULL_REQUEST" != "false" ]]; then
  echo -e "\033[0;33mPull Request detected; not installing extra software.\033[0m"
  exit 0
 fi

tests/test-kubeadm-dind-cluster.sh

@@ -70,7 +70,7 @@ verify_deploy(){
 
 main(){
 
- if [[ -z "$BLUEMIX_AUTH" ]]
+ if [[ "$TRAVIS_PULL_REQUEST" != "false" ]]
  then
  if ! setup_dind-cluster; then
  test_failed
@@ -82,7 +82,7 @@ main(){
  test_passed
  fi
  else
- echo -e "\033[0;33mBluemix Auth detected; not running kubeadm-dind-cluster test.\033[0m"
+ echo -e "\033[0;33mNot a Pull Request. Not running kubeadm-dind-cluster test.\033[0m"
  exit 0
  fi
 }

tests/test-kubernetes.sh

@@ -74,7 +74,7 @@ verify_deploy(){
  for IP in $IPS; do
  while true
  do
- code=$(curl -sw '%{http_code}' http://"$IP":"$NODEPORT" -o /dev/null)
+ code=$(curl -sw '%{http_code}' http://"$IP":30080 -o /dev/null)
  if [ "$code" = "200" ]; then
  echo "Account Summary is up."
  break
@@ -91,8 +91,8 @@ verify_deploy(){
 }
 
 main(){
- if [[ -z "$BLUEMIX_AUTH" ]]; then
- echo -e "\033[0;33mFork detected; not running Bluemix Container Service test.\033[0m"
+ if [[ "$TRAVIS_PULL_REQUEST" != "false" ]]; then
+ echo -e "\033[0;33mPull Request detected; not running Bluemix Container Service test.\033[0m"
  exit 0
  fi