X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=utils%2Fci%2Fjenkins_entrypoint.sh;h=7e2234ace7c73df5a4e9431e9c962e14917f05fa;hb=d7cbd218427bbfe573d062710006d56751e4406b;hp=e8e00ef6965296d57954863bca170f9830a26208;hpb=8046dfeb9cd226a3425a4e3a9f8ac13a3d11348c;p=osm%2Fvim-emu.git

diff --git a/utils/ci/jenkins_entrypoint.sh b/utils/ci/jenkins_entrypoint.sh
index e8e00ef..7e2234a 100755
--- a/utils/ci/jenkins_entrypoint.sh
+++ b/utils/ci/jenkins_entrypoint.sh
@@ -1,11 +1,39 @@
 #!/bin/bash
+# Copyright (c) 2015 SONATA-NFV and Paderborn University
+# ALL RIGHTS RESERVED.
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# Neither the name of the SONATA-NFV, Paderborn University
+# nor the names of its contributors may be used to endorse or promote
+# products derived from this software without specific prior written
+# permission.
+#
+# This work has been performed in the framework of the SONATA project,
+# funded by the European Commission under Grant number 671517 through
+# the Horizon 2020 and 5G-PPP programmes. The authors would like to
+# acknowledge the contributions of their colleagues of the SONATA
+# partner consortium (www.sonata-nfv.eu).
+# 
 # This is the entry point for Jenkins.
 # Script has do be called from "son-emu" root directory, like: sudo ./utils/ci/jenkins_entrypoint.sh
 export DOCKER_HOST="unix:///var/run/docker.sock"
 
 # don't rely on Debian/Ubuntu Docker engine
 apt-get remove docker-engine
+# make sure we start from scratch
+pip uninstall docker-py
+pip uninstall docker
 
 set -e
 set -x
@@ -15,7 +43,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 +62,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