Fix Scripts for Travis CI

Changed scripts to enhance Travis CI. Various scripts change to check for TRAVIS_PULL_REQUEST instead of BLUEMIX_AUTH. Change $NODE_PORT to 30080 in test-kubernetes.sh. kubeadm test is now ran regardless if it is a PR or not.

Author: AnthonyAmanse

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

@@ -69,21 +69,14 @@ verify_deploy(){
 }
 
 main(){
-
-    if [[ -z "$BLUEMIX_AUTH" ]]
-    then
-        if ! setup_dind-cluster; then
-            test_failed
-        elif ! kubectl_deploy; then
-            test_failed
-        elif ! verify_deploy; then
-            test_failed
-        else
-            test_passed
-        fi
+    if ! setup_dind-cluster; then
+        test_failed
+    elif ! kubectl_deploy; then
+        test_failed
+    elif ! verify_deploy; then
+        test_failed
     else
-      echo -e "\033[0;33mBluemix Auth detected; not running kubeadm-dind-cluster test.\033[0m"
-      exit 0
+        test_passed
     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