summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvrvarma <vv8305@att.com>2019-03-27 09:03:54 -0400
committervrvarma <vv8305@att.com>2019-03-27 09:26:53 -0400
commitff08e67156aa736081d8b8671882cf78d3b6f668 (patch)
treea2a6fba3bbdf33cfebadc0c2786bd60ab4388fa1
parentb5a14b3f7d9089966da964b461226c8db118950c (diff)
Fix CSIT automated test jobs for osdf
Change-Id: Ief9fd977e1b443f65cc00c3168fae6f7c4764bd1 Signed-off-by: vrvarma <vv8305@att.com> Issue-ID: OPTFRA-464
-rw-r--r--test/functest/simulators/Dockerfile3
-rwxr-xr-xtest/functest/simulators/build_sim_image.sh1
-rw-r--r--[-rwxr-xr-x]test/functest/simulators/oof_dependencies_simulators.py0
-rwxr-xr-xtest/functest/simulators/start_sim.sh4
4 files changed, 7 insertions, 1 deletions
diff --git a/test/functest/simulators/Dockerfile b/test/functest/simulators/Dockerfile
index 7f6b49f..ca32895 100644
--- a/test/functest/simulators/Dockerfile
+++ b/test/functest/simulators/Dockerfile
@@ -30,5 +30,6 @@ RUN ln -s /usr/bin/python3.5 /usr/bin/python
ADD requirements.txt /requirements.txt
RUN pip install -r requirements.txt
ADD sim /sim
+ADD start_sim.sh /start_sim.sh
-CMD cd /sim && python oof_dependencies_simulators.py > simulator-logs 2>&1 \ No newline at end of file
+CMD ["/start_sim.sh"] \ No newline at end of file
diff --git a/test/functest/simulators/build_sim_image.sh b/test/functest/simulators/build_sim_image.sh
index c035e9a..8efb273 100755
--- a/test/functest/simulators/build_sim_image.sh
+++ b/test/functest/simulators/build_sim_image.sh
@@ -39,6 +39,7 @@ cp -r $SIMULATORS_DIR/policy $DOCKER_DIR/sim
cp $TEST_DIR/policy-local-files/*.json $DOCKER_DIR/sim/policy/response-payloads/pdp-has-vcpe-good
cp $SIMULATORS_DIR/oof_dependencies_simulators.py $DOCKER_DIR/sim/oof_dependencies_simulators.py
cp $OSDF_DIR/requirements.txt $DOCKER_DIR
+cp -r $SIMULATORS_DIR/start_sim.sh $DOCKER_DIR/
cd $DOCKER_DIR
diff --git a/test/functest/simulators/oof_dependencies_simulators.py b/test/functest/simulators/oof_dependencies_simulators.py
index 2995861..2995861 100755..100644
--- a/test/functest/simulators/oof_dependencies_simulators.py
+++ b/test/functest/simulators/oof_dependencies_simulators.py
diff --git a/test/functest/simulators/start_sim.sh b/test/functest/simulators/start_sim.sh
new file mode 100755
index 0000000..1d17d65
--- /dev/null
+++ b/test/functest/simulators/start_sim.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+cd /sim
+python oof_dependencies_simulators.py > simulator-logs 2>&1 \ No newline at end of file