From b38ecccb8ab9cd1e631f89c92f6b88e420b2a1b0 Mon Sep 17 00:00:00 2001
From: "francois.cellier" <francois.cellier@orange.com>
Date: Tue, 13 Feb 2018 13:06:51 +0100
Subject: Add the moon_pythonfunctest container to perform functionnal tests

Change-Id: I2be863862ce7df408f759664b10af45416b3d712
---
 moon_forming/Dockerfile |  4 +---
 moon_forming/switch.sh  | 19 -------------------
 2 files changed, 1 insertion(+), 22 deletions(-)
 delete mode 100644 moon_forming/switch.sh

(limited to 'moon_forming')

diff --git a/moon_forming/Dockerfile b/moon_forming/Dockerfile
index 74616c89..ffae02c5 100644
--- a/moon_forming/Dockerfile
+++ b/moon_forming/Dockerfile
@@ -3,9 +3,7 @@ FROM python:3
 WORKDIR /usr/src/app
 RUN pip install --no-cache-dir --upgrade requests pytest pyyaml python_moonutilities python_moondb python_moonclient
 
-ENV COMMAND "config"
-
 ADD . /root
 WORKDIR /root
 
-CMD /bin/bash /root/switch.sh ${COMMAND}
+CMD /bin/bash /root/config_moon.sh 
diff --git a/moon_forming/switch.sh b/moon_forming/switch.sh
deleted file mode 100644
index adb1ebe9..00000000
--- a/moon_forming/switch.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-
-CMD=$1
-
-echo "COMMAND IS ${CMD}"
-
-if [ "${CMD}" = "functest" ]; then
-    echo "FUNCTIONAL TESTS"
-    ls -l /data
-    ls -l /data/tests
-    sh /data/tests/functional_pod/run_functional_tests.sh
-#elif [ $CMD == "unittest" ]; then
-#    sh /data/tests/functional_pod/run_functional_tests.sh
-else
-    echo "CONFIGURATION"
-    bash config_moon.sh
-fi
-
-echo "<END OF JOB>"
\ No newline at end of file
-- 
cgit 1.2.3-korg