Update CI

.travis.yml

@@ -1,8 +1,10 @@
+---
 language: bash
 script: true
 sudo: required
-before_install:
-- bash scripts/install.sh
+install:
+  - "./scripts/install.sh"
+  - "./scripts/bx_auth.sh"
 group: stable
 dist: precise
 os: linux

scripts/bx_auth.sh

@@ -0,0 +1,24 @@
+#!/bin/bash -e
+
+# This script is intended to be run by Travis CI. If running elsewhere, invoke
+# it with: TRAVIS_PULL_REQUEST=false [path to script]
+# If no credentials are provided at runtime, bx will use the environment
+# variable BLUEMIX_API_KEY. If no API key is set, it will prompt for
+# credentials.
+
+# shellcheck disable=SC1090
+source "$(dirname "$0")"/../scripts/resources.sh
+
+BLUEMIX_ORG="Developer Advocacy"
+BLUEMIX_SPACE="dev"
+
+is_pull_request "$0"
+
+echo "Authenticating to Bluemix"
+bx login -a https://api.ng.bluemix.net
+
+echo "Targeting Bluemix org and space"
+bx target -o "$BLUEMIX_ORG" -s "$BLUEMIX_SPACE"
+
+echo "Initializing Bluemix Container Service"
+bx cs init

scripts/install.sh

@@ -12,10 +12,7 @@ tar -xvf Bluemix_CLI.tar.gz
 sudo ./Bluemix_CLI/install_bluemix_cli
 }
 
-function bluemix_auth() {
-echo "Authenticating with Bluemix"
-echo "1" | bx login -a https://api.ng.bluemix.net --apikey $BLUEMIX_AUTH
-curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl
+function install_kubectl() {
 bx plugin install container-service -r Bluemix
 echo "Installing kubectl"
 chmod +x ./kubectl
@@ -186,7 +183,7 @@ done
 
 
 install_bluemix_cli
-bluemix_auth
+install_kubectl
 cluster_setup
 initial_setup
 create_platform_services

scripts/resources.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+# This script contains functions used by many of the scripts found in scripts/
+# and tests/.
+
+test_failed(){
+    echo -e >&2 "\033[0;31m$1 test failed!\033[0m"
+    exit 1
+}
+
+test_passed(){
+    echo -e "\033[0;32m$1 test passed!\033[0m"
+}
+
+is_pull_request(){
+  if [[ "$TRAVIS_PULL_REQUEST" != "false" ]]; then
+      echo -e "\033[0;33mPull Request detected; not running $1!\033[0m"
+      exit 0
+  fi
+}