From cc75084ed50c33b7f83821ba7ae31cc130c2a655 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Thu, 12 Oct 2017 10:05:44 +0200 Subject: [PATCH] ceph-docker-prs: clean code on build script docker installation is already handled in https://github.com/ceph/ceph-docker/blob/master/tests/tox.sh#L26-L38 using `sg docker` to run tox is no longer necessary because of: https://github.com/ceph/ceph-docker/blob/master/tests/tox.sh#L37 Signed-off-by: Guillaume Abrioux --- ceph-docker-prs/build/build | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/ceph-docker-prs/build/build b/ceph-docker-prs/build/build index a2995e87..589d3fc5 100644 --- a/ceph-docker-prs/build/build +++ b/ceph-docker-prs/build/build @@ -9,21 +9,12 @@ source $VENV/activate WORKDIR=$(mktemp -td tox.XXXXXXXXXX) -sudo apt-get install -y docker.io - -sudo gpasswd -a ${USER} docker -sudo systemctl restart docker -newgrp docker - delete_libvirt_vms clear_libvirt_networks restart_libvirt_services update_vagrant_boxes -# adding groups on the fly doesn't guarantee their availability -# so we must use `sg` to execute the tests as part of the docker group to avoid -# 'Permission Denied` when tryin to talk over the socket -if ! timeout 3h sg docker -c "$VENV/tox -rv -e=$SCENARIO --workdir=$WORKDIR"; then +if ! timeout 3h $VENV/tox -rv -e=$SCENARIO --workdir=$WORKDIR; then echo "ERROR: Job didn't complete successfully or got stuck for more than 3h." exit 1 fi -- 2.39.5