Merge pull request #98 from loafyloaf/remote_ci

AnthonyAmanse · web-flow · commit fa5bd203767a · 2019-05-08T10:59:40.000-07:00
Update CI to use remote CI scripts
diff --git a/.travis.yml b/.travis.yml
@@ -17,21 +17,21 @@ services:
 matrix:
   fast_finish: true
 
-env:
-  - TEST_RUN="./tests/test-docker-compose.sh"
-  - TEST_RUN="./tests/test-minikube.sh"
-  - TEST_RUN="./tests/test-kubernetes.sh"
-
 before_install:
   - sudo apt-get install shellcheck
-  - pip install -U -r test-requirements.txt
-
-install:
-  - "./scripts/install.sh"
-  - "./scripts/bx_auth.sh"
+  - sudo pip install yamllint
+  - git clone https://github.com/IBM/pattern-ci
 
 before_script:
-  - "./tests/test-shellcheck.sh"
-  - "./tests/test-yamllint.sh"
-
-script: "$TEST_RUN"
+  - "./pattern-ci/tests/shellcheck-lint.sh"
+  - "./pattern-ci/tests/yaml-lint.sh"
+
+jobs:
+  include:
+    - script: ./tests/test-docker-compose.sh
+    - install: ./pattern-ci/scripts/install-minikube.sh
+      script: ./tests/test-minikube.sh
+    - install:
+        - ./pattern-ci/scripts/install-ibmcloud.sh
+        - ./pattern-ci/scripts/bx-auth.sh
+      script: ./tests/test-kubernetes.sh
diff --git a/tests/test-docker-compose.sh b/tests/test-docker-compose.sh
@@ -1,7 +1,7 @@
 #!/bin/bash -e
 
 # shellcheck disable=SC1090
-source "$(dirname "$0")"/../scripts/resources.sh
+source "$(dirname "$0")"/../pattern-ci/scripts/resources.sh
 
 main(){
     if ! docker-compose up -d; then
diff --git a/tests/test-kubernetes.sh b/tests/test-kubernetes.sh
@@ -4,7 +4,7 @@
 # it with: TRAVIS_PULL_REQUEST=false [path to script]
 
 # shellcheck disable=SC1090
-source "$(dirname "$0")"/../scripts/resources.sh
+source "$(dirname "$0")"/../pattern-ci/scripts/resources.sh
 
 kubeclt_clean() {
     echo "Cleaning cluster"
diff --git a/tests/test-minikube.sh b/tests/test-minikube.sh
@@ -1,16 +1,7 @@
 #!/bin/bash -e
 
 # shellcheck disable=SC1090
-source "$(dirname "$0")"/../scripts/resources.sh
-
-setup_minikube() {
-  export CHANGE_MINIKUBE_NONE_USER=true
-  curl -Lo kubectl https://storage.googleapis.com/kubernetes-release/release/v1.9.0/bin/linux/amd64/kubectl && chmod +x kubectl && sudo mv kubectl /usr/local/bin/
-  curl -Lo minikube https://storage.googleapis.com/minikube/releases/v0.25.2/minikube-linux-amd64 && chmod +x minikube && sudo mv minikube /usr/local/bin/
-  sudo -E minikube start --vm-driver=none --kubernetes-version=v1.9.0
-  minikube update-context
-  JSONPATH='{range .items[*]}{@.metadata.name}:{range @.status.conditions[*]}{@.type}={@.status};{end}{end}'; until kubectl get nodes -o jsonpath="$JSONPATH" 2>&1 | grep -q "Ready=True"; do sleep 1; done
-}
+source "$(dirname "$0")"/../pattern-ci/scripts/resources.sh
 
 kubectl_deploy() {
     echo "Running scripts/quickstart.sh"
@@ -39,9 +30,7 @@ verify_deploy(){
 }
 
 main(){
-    if ! setup_minikube; then
-        test_failed "$0"
-    elif ! kubectl_deploy; then
+    if ! kubectl_deploy; then
         test_failed "$0"
     elif ! verify_deploy; then
         test_failed "$0"
