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

Commit 949dc96

authored

Merge pull request #78 from AnthonyAmanse/fix-test

Travis CI improvements

2 parents a8154ef + 2157590 commit 949dc96Copy full SHA for 949dc96

File tree

+11

-8

lines changed

+11

-8

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ matrix:`
`21`	`21`
`22`	`22`	`env:`
`23`	`23`	`- TEST_RUN="./tests/test-docker-compose.sh"`
`24`		`- - TEST_RUN="./tests/test-kubeadm-dind-cluster.sh"`
	`24`	`+ - TEST_RUN="./tests/test-minikube.sh"`
`25`	`25`	`- TEST_RUN="./tests/test-kubernetes.sh"`
`26`	`26`
`27`	`27`	`before_install:`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,9 @@ source "$(dirname "0ドル")"/../scripts/resources.sh`
`8`	`8`
`9`	`9`	`kubeclt_clean() {`
`10`	`10`	`echo "Cleaning cluster"`
	`11`	`+ kubectl delete pvc,deployment,service,replicaset -l app=gitlab`
	`12`	`+ sleep 30s`
`11`	`13`	`kubectl delete pv local-volume-1 local-volume-2 local-volume-3`
`12`		`- kubectl delete deployment,service,pvc,replicaset -l app=gitlab`
`13`	`14`	`}`
`14`	`15`
`15`	`16`	`kubectl_config() {`

Lines changed: 8 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,11 +3,13 @@`
`3`	`3`	`# shellcheck disable=SC1090`
`4`	`4`	`source "$(dirname "0ドル")"/../scripts/resources.sh`
`5`	`5`
`6`		`-setup_dind-cluster() {`
`7`		`- wget https://cdn.rawgit.com/Mirantis/kubeadm-dind-cluster/master/fixed/dind-cluster-v1.8.sh`
`8`		`- chmod 0755 dind-cluster-v1.8.sh`
`9`		`- ./dind-cluster-v1.8.sh up`
`10`		`- export PATH="$HOME/.kubeadm-dind-cluster:$PATH"`
	`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`
`11`	`13`	`}`
`12`	`14`
`13`	`15`	`kubectl_deploy() {`
`@@ -37,7 +39,7 @@ verify_deploy(){`
`37`	`39`	`}`
`38`	`40`
`39`	`41`	`main(){`
`40`		`- if ! setup_dind-cluster; then`
	`42`	`+ if ! setup_minikube; then`
`41`	`43`	`test_failed "0ドル"`
`42`	`44`	`elif ! kubectl_deploy; then`
`43`	`45`	`test_failed "0ドル"`

Comments

(0)