aboutsummaryrefslogtreecommitdiffstats
path: root/moon_forming
diff options
context:
space:
mode:
authorfrancois.cellier <francois.cellier@orange.com>2018-02-13 13:06:51 +0100
committerfrancois.cellier <francois.cellier@orange.com>2018-02-13 17:01:47 +0100
commitb38ecccb8ab9cd1e631f89c92f6b88e420b2a1b0 (patch)
tree8403f71cef84a5761f533bb6fc7aa08daa234f16 /moon_forming
parent4841ea360bb6feec4d2c644040e12a2657769634 (diff)
Add the moon_pythonfunctest container to perform functionnal tests
Change-Id: I2be863862ce7df408f759664b10af45416b3d712
Diffstat (limited to 'moon_forming')
-rw-r--r--moon_forming/Dockerfile4
-rw-r--r--moon_forming/switch.sh19
2 files changed, 1 insertions, 22 deletions
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