From 188ab68acc5ded53a7bbcf07c237b3e33a0e4e69 Mon Sep 17 00:00:00 2001
From: peusterm <manuel.peuster@uni-paderborn.de>
Date: Mon, 6 Feb 2017 13:35:12 +0100
Subject: [PATCH] Cleanup: Removed depricated Docker build scripts and test
 scripts.

---
 Dockerfile                             |  1 -
 utils/ci/build_01_unit_tests.sh        | 13 -------
 utils/ci/build_02_integration_tests.sh |  4 --
 utils/ci/junit-xml/.gitkeep            |  0
 utils/docker/Dockerfile                | 52 --------------------------
 utils/docker/entrypoint.sh             | 12 ------
 6 files changed, 82 deletions(-)
 delete mode 120000 Dockerfile
 delete mode 100755 utils/ci/build_01_unit_tests.sh
 delete mode 100755 utils/ci/build_02_integration_tests.sh
 delete mode 100755 utils/ci/junit-xml/.gitkeep
 delete mode 100755 utils/docker/Dockerfile
 delete mode 100755 utils/docker/entrypoint.sh

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/junit-xml/.gitkeep b/utils/ci/junit-xml/.gitkeep
deleted file mode 100755
index e69de29..0000000
diff --git a/utils/docker/Dockerfile b/utils/docker/Dockerfile
deleted file mode 100755
index facbb0e..0000000
--- a/utils/docker/Dockerfile
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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 [, ANY ADDITIONAL AFFILIATION]
-# 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).
-
-FROM containernet/containernet
-MAINTAINER manuel@peuster.de
-
-ENV SON_EMU_IN_DOCKER 1
-
-WORKDIR /son-emu
-COPY . /son-emu/
-
-RUN apt-get clean
-
-WORKDIR /son-emu/ansible
-RUN ansible-playbook install.yml
-
-WORKDIR /son-emu
-# we need to reset the __pycache__ for correct test discovery
-RUN rm -rf src/emuvim/test/__pycache__ 
-RUN rm -rf src/emuvim/test/unittests/__pycache__ 
-RUN rm -rf src/emuvim/test/integrationtests/__pycache__ 
-RUN python setup.py install 
-RUN echo 'Done'
-
-
-ENTRYPOINT ["/son-emu/utils/docker/entrypoint.sh"]
-
-# dummy GK, zerorpc, DCNetwork zerorpc, cAdvisor, restAPI
-EXPOSE 5000 4242 5151 8090 5001
diff --git a/utils/docker/entrypoint.sh b/utils/docker/entrypoint.sh
deleted file mode 100755
index 4349efd..0000000
--- a/utils/docker/entrypoint.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/bash -e
-set -x
-
-#cp /containernet/util/docker/entrypoint.sh /tmp/x.sh
-#cat /tmp/x.sh | awk 'NR==1{print; print "set -x"} NR!=1' > /conteinernet/util/docker/entrypoint.sh
-
-# this cannot be done from the Dockerfile since we have the socket not mounted during build
-# this image is needed for the monitoring in son-emu
-#echo 'Pulling the "google/cadvisor" image ... please wait'
-#docker pull 'google/cadvisor'
-
-exec /containernet/util/docker/entrypoint.sh $*
-- 
2.17.1