projects
/
osm
/
vim-emu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Protect backslash to avoid premature substitution
[osm/vim-emu.git]
/
utils
/
ci
/
jenkins_entrypoint.sh
diff --git
a/utils/ci/jenkins_entrypoint.sh
b/utils/ci/jenkins_entrypoint.sh
index
e8e00ef
..
2013db9
100755
(executable)
--- a/
utils/ci/jenkins_entrypoint.sh
+++ b/
utils/ci/jenkins_entrypoint.sh
@@
-6,6
+6,9
@@
export DOCKER_HOST="unix:///var/run/docker.sock"
# don't rely on Debian/Ubuntu Docker engine
apt-get remove docker-engine
# 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
set -e
set -x
@@
-15,7
+18,7
@@
cd $SON_EMU_DIR/../
# prepare
apt-get update
# 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
echo "localhost ansible_connection=local" >> /etc/ansible/hosts
# install containernet
@@
-34,7
+37,7
@@
ansible-playbook install.yml
echo "Running son-emu unit tests to validate installation"
cd $SON_EMU_DIR
python setup.py develop
echo "Running son-emu unit tests to validate installation"
cd $SON_EMU_DIR
python setup.py develop
-py.test -v src/emuvim/test/unittests
+