diff --git a/playbooks/spark-integration-test-minikube-k8s/run.yaml b/playbooks/spark-integration-test-minikube-k8s/run.yaml index 417e33c6c..7e577dc9a 100644 --- a/playbooks/spark-integration-test-minikube-k8s/run.yaml +++ b/playbooks/spark-integration-test-minikube-k8s/run.yaml @@ -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 diff --git a/roles/install-docker/tasks/main.yml b/roles/install-docker/tasks/main.yml index 263686ba0..bbabf1066 100644 --- a/roles/install-docker/tasks/main.yml +++ b/roles/install-docker/tasks/main.yml @@ -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