From: stevenvanrossem <steven.vanrossem@intec.ugent.be>
Date: Wed, 8 Feb 2017 11:25:53 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/upstream/master'
X-Git-Tag: v3.1~45^2~5
X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Fvim-emu.git;a=commitdiff_plain;h=e0796231bf6fd5b7d09d4a850227be7bc9bbdc6a;hp=e074d11450cd221a6005598e89bc0f0f1de63f40

Merge remote-tracking branch 'remotes/upstream/master'

Conflicts:
	utils/docker/Dockerfile
---

diff --git a/Dockerfile b/Dockerfile
deleted file mode 120000
index a0f6cc3..0000000
--- a/Dockerfile
+++ /dev/null
@@ -1 +0,0 @@
-utils/docker/Dockerfile
\ No newline at end of file
diff --git a/utils/ci/build_01_unit_tests.sh b/utils/ci/build_01_unit_tests.sh
deleted file mode 100755
index 5544503..0000000
--- a/utils/ci/build_01_unit_tests.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#! /bin/bash -e
-set -x
-
-# Go to the 'root' directory
-SCRIPT_DIR=$(dirname $(readlink -f $0))
-BASE_DIR=$(readlink -f "${SCRIPT_DIR}/../..")
-cd ${BASE_DIR}
-
-# Remove old test output
-rm -rf utils/ci/junit-xml/*
-
-# Launch the unit testing on emuvim
-py.test -v --junit-xml=utils/ci/junit-xml/pytest_emuvim.xml src/emuvim/test/unittests
diff --git a/utils/ci/build_02_integration_tests.sh b/utils/ci/build_02_integration_tests.sh
deleted file mode 100755
index af027e6..0000000
--- a/utils/ci/build_02_integration_tests.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#! /bin/bash -e
-set -x
-
-son-emu-cli | grep 'Usage'
diff --git a/utils/ci/jenkins_entrypoint.sh b/utils/ci/jenkins_entrypoint.sh
new file mode 100755
index 0000000..2013db9
--- /dev/null
+++ b/utils/ci/jenkins_entrypoint.sh
@@ -0,0 +1,43 @@
+#!/bin/bash
+#
+# 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
+
+SON_EMU_DIR=$(pwd)
+cd $SON_EMU_DIR/../
+
+# prepare
+apt-get update
+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
+git clone https://github.com/containernet/containernet.git
+CONTAINERNET_DIR=$(pwd)/containernet
+echo "Installing containernet (will take some time ~30 minutes) ..."
+cd $CONTAINERNET_DIR/ansible
+ansible-playbook install.yml
+
+# install son-emu
+echo "Installing son-emu (will take some time) ..."
+cd $SON_EMU_DIR/ansible
+ansible-playbook install.yml
+
+# execute son-emu tests at the end to validate installation
+echo "Running son-emu unit tests to validate installation"
+cd $SON_EMU_DIR
+python setup.py develop
+
+
+
+
diff --git a/utils/ci/junit-xml/.gitkeep b/utils/ci/junit-xml/.gitkeep
deleted file mode 100755
index e69de29..0000000
diff --git a/utils/docker/entrypoint.sh b/utils/docker/entrypoint.sh
old mode 100755
new mode 100644
index 4349efd..c67e276
--- a/utils/docker/entrypoint.sh
+++ b/utils/docker/entrypoint.sh
@@ -9,4 +9,4 @@ set -x
 #echo 'Pulling the "google/cadvisor" image ... please wait'
 #docker pull 'google/cadvisor'
 
-exec /containernet/util/docker/entrypoint.sh $*
+exec /containernet/util/docker/entrypoint.sh $*
\ No newline at end of file