Fix scripts to check for PR

Author: AnthonyAmanse

scripts/bx_auth.sh

@@ -3,7 +3,7 @@
 BLUEMIX_ORG="Developer Advocacy"
 BLUEMIX_SPACE="dev"
 
-if [[ -z "$BLUEMIX_AUTH" ]]; then
+if [[ "$TRAVIS_PULL_REQUEST" != "false" ]]; then
  echo -e "\033[0;33mFork 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