X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=utils%2Fci%2Fjenkins_entrypoint.sh;h=a4fd0117db7171d78ce511af10ec9773cc52ab4c;hb=2ed4ae40f306361cd3187dcb47b8c1f13e89cf9a;hp=65d754a4b72fd6494a43115e8a3967c79c387a4b;hpb=7e8aa5eb2898ed241f252599e0b8cb12bf38f794;p=osm%2Fvim-emu.git

diff --git a/utils/ci/jenkins_entrypoint.sh b/utils/ci/jenkins_entrypoint.sh
index 65d754a..a4fd011 100755
--- a/utils/ci/jenkins_entrypoint.sh
+++ b/utils/ci/jenkins_entrypoint.sh
@@ -5,7 +5,10 @@
 export DOCKER_HOST="unix:///var/run/docker.sock"
 
 # don't rely on Debian/Ubuntu Docker engine
-apt-get remove docker-enigne
+apt-get remove docker-engine
+# make sure we start from scratch
+pip uninstall docker-py
+pip uninstall docker
 
 set -e
 set -x
@@ -15,7 +18,7 @@ cd $SON_EMU_DIR/../
 
 # prepare
 apt-get update
-apt-get install -y git ansible aptitude
+DEBIAN_FRONTEND=noninteractive apt-get install -o Dpkg::Options::="--force-confold" --force-yes -y git ansible aptitude
 echo "localhost ansible_connection=local" >> /etc/ansible/hosts
 
 # install containernet
@@ -34,7 +37,8 @@ ansible-playbook install.yml
 echo "Running son-emu unit tests to validate installation"
 cd $SON_EMU_DIR
 python setup.py develop
-py.test -v src/emuvim/test/unittests
 
+# run the unit tests
+py.test -v src/emuvim/test/unittests