]> git.apps.os.sepia.ceph.com Git - ceph-build.git/commitdiff
ceph-docker-prs: clean code on build script 886/head
authorGuillaume Abrioux <gabrioux@redhat.com>
Thu, 12 Oct 2017 08:05:44 +0000 (10:05 +0200)
committerGuillaume Abrioux <gabrioux@redhat.com>
Thu, 12 Oct 2017 12:48:35 +0000 (14:48 +0200)
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 <gabrioux@redhat.com>
ceph-docker-prs/build/build

index a2995e8762b7aebf66357aa2e6ae45c8735ee483..589d3fc5461b2e1b6f2d7bf03f2719deacbe74bd 100644 (file)
@@ -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