This repository was archived by the owner on Jul 18, 2024. It is now read-only.

Commit fa5bd20

authored

Merge pull request #98 from loafyloaf/remote_ci

Update CI to use remote CI scripts

2 parents 5f56169 + 73ec364 commit fa5bd20Copy full SHA for fa5bd20

File tree

+18

-29

lines changed

+18

-29

lines changed

Lines changed: 14 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,21 +17,21 @@ services:`
`17`	`17`	`matrix:`
`18`	`18`	`fast_finish: true`
`19`	`19`
`20`		`-env:`
`21`		`- - TEST_RUN="./tests/test-docker-compose.sh"`
`22`		`- - TEST_RUN="./tests/test-minikube.sh"`
`23`		`- - TEST_RUN="./tests/test-kubernetes.sh"`
`24`		`-`
`25`	`20`	`before_install:`
`26`	`21`	`- sudo apt-get install shellcheck`
`27`		`- - pip install -U -r test-requirements.txt`
`28`		`-`
`29`		`-install:`
`30`		`- - "./scripts/install.sh"`
`31`		`- - "./scripts/bx_auth.sh"`
	`22`	`+ - sudo pip install yamllint`
	`23`	`+ - git clone https://github.com/IBM/pattern-ci`
`32`	`24`
`33`	`25`	`before_script:`
`34`		`- - "./tests/test-shellcheck.sh"`
`35`		`- - "./tests/test-yamllint.sh"`
`36`		`-`
`37`		`-script: "$TEST_RUN"`
	`26`	`+ - "./pattern-ci/tests/shellcheck-lint.sh"`
	`27`	`+ - "./pattern-ci/tests/yaml-lint.sh"`
	`28`	`+`
	`29`	`+jobs:`
	`30`	`+ include:`
	`31`	`+ - script: ./tests/test-docker-compose.sh`
	`32`	`+ - install: ./pattern-ci/scripts/install-minikube.sh`
	`33`	`+ script: ./tests/test-minikube.sh`
	`34`	`+ - install:`
	`35`	`+ - ./pattern-ci/scripts/install-ibmcloud.sh`
	`36`	`+ - ./pattern-ci/scripts/bx-auth.sh`
	`37`	`+ script: ./tests/test-kubernetes.sh`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`#!/bin/bash -e`
`2`	`2`
`3`	`3`	`# shellcheck disable=SC1090`
`4`		`-source "$(dirname "0ドル")"/../scripts/resources.sh`
	`4`	`+source "$(dirname "0ドル")"/../pattern-ci/scripts/resources.sh`
`5`	`5`
`6`	`6`	`main(){`
`7`	`7`	`if ! docker-compose up -d; then`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`# it with: TRAVIS_PULL_REQUEST=false [path to script]`
`5`	`5`
`6`	`6`	`# shellcheck disable=SC1090`
`7`		`-source "$(dirname "0ドル")"/../scripts/resources.sh`
	`7`	`+source "$(dirname "0ドル")"/../pattern-ci/scripts/resources.sh`
`8`	`8`
`9`	`9`	`kubeclt_clean() {`
`10`	`10`	`echo "Cleaning cluster"`

Lines changed: 2 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,16 +1,7 @@`
`1`	`1`	`#!/bin/bash -e`
`2`	`2`
`3`	`3`	`# shellcheck disable=SC1090`
`4`		`-source "$(dirname "0ドル")"/../scripts/resources.sh`
`5`		`-`
`6`		`-setup_minikube() {`
`7`		`- export CHANGE_MINIKUBE_NONE_USER=true`
`8`		`- 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/`
`9`		`- curl -Lo minikube https://storage.googleapis.com/minikube/releases/v0.25.2/minikube-linux-amd64 && chmod +x minikube && sudo mv minikube /usr/local/bin/`
`10`		`- sudo -E minikube start --vm-driver=none --kubernetes-version=v1.9.0`
`11`		`- minikube update-context`
`12`		`- 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`
`13`		`-}`
	`4`	`+source "$(dirname "0ドル")"/../pattern-ci/scripts/resources.sh`
`14`	`5`
`15`	`6`	`kubectl_deploy() {`
`16`	`7`	`echo "Running scripts/quickstart.sh"`
`@@ -39,9 +30,7 @@ verify_deploy(){`
`39`	`30`	`}`
`40`	`31`
`41`	`32`	`main(){`
`42`		`- if ! setup_minikube; then`
`43`		`- test_failed "0ドル"`
`44`		`- elif ! kubectl_deploy; then`
	`33`	`+ if ! kubectl_deploy; then`
`45`	`34`	`test_failed "0ドル"`
`46`	`35`	`elif ! verify_deploy; then`
`47`	`36`	`test_failed "0ドル"`

Comments

(0)