Skip to content

Commit

Permalink
Fix install-docker role
Browse files Browse the repository at this point in the history
1. systemctl is not available on Ubuntu 14.04, so using
   "service docker restart" as a workaround.
2. change option "--r" position in spark-inegration-test-minikube-k8s
   job to avoid "--r" is bypassed to mvn.

Related-Bug: theopenlab/openlab#308
Related-Bug: theopenlab/openlab#310
  • Loading branch information
kiwik committed Jul 1, 2019
1 parent bf132ee commit b1ad923
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion playbooks/spark-integration-test-minikube-k8s/run.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
kubectl create clusterrolebinding spark-role --clusterrole=edit --serviceaccount=default:spark --namespace=default
# NOTE: the distribution step may fail due to dependencies downloading failure, so we suport retry
for i in $(seq 1 3); do ./dev/make-distribution.sh --tgz -Pkubernetes --r && s=0 && break || s=$? && sleep 5; done; (exit $s)
for i in $(seq 1 3); do ./dev/make-distribution.sh --r --tgz -Pkubernetes && s=0 && break || s=$? && sleep 5; done; (exit $s)
pushd resource-managers/kubernetes/integration-tests
dev/dev-run-integration-tests.sh --spark-tgz $(realpath ../../../spark-*.tgz) --namespace default --service-account spark
Expand Down
6 changes: 3 additions & 3 deletions roles/install-docker/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
iptables -P FORWARD ACCEPT
iptables -P OUTPUT ACCEPT
# Restart docker.
systemctl daemon-reload
systemctl restart docker
# NOTE: systemctl is not available in Ubuntu 14.04, so use "service"
# command for compatibility
service docker restart
executable: /bin/bash

0 comments on commit b1ad923

Please sign in to comment.