From 9f1a642b9701630892d27db5750033de852a62dc Mon Sep 17 00:00:00 2001
From: garciay <yann.garcia@fscom.fr>
Date: Tue, 28 Apr 2020 14:13:42 +0200
Subject: [PATCH] Bug fixed in Dockerfile

---
 docker/home/etc/init.d/40-lewis.sh                 | 14 --------------
 .../home/etc/init.d/{50-stf569.sh => 40-stf569.sh} |  4 +---
 scripts/update_mec_project.bash                    |  2 +-
 3 files changed, 2 insertions(+), 18 deletions(-)
 delete mode 100755 docker/home/etc/init.d/40-lewis.sh
 rename docker/home/etc/init.d/{50-stf569.sh => 40-stf569.sh} (85%)

diff --git a/docker/home/etc/init.d/40-lewis.sh b/docker/home/etc/init.d/40-lewis.sh
deleted file mode 100755
index 986c58d..0000000
--- a/docker/home/etc/init.d/40-lewis.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-#set -e
-set -vx
-
-echo -e "*****************************\n* Install osip\n*****************************\n"
-cd ${HOME}/dev
-git clone https://forge.etsi.org/rep/plugtests/nfv/ttcn-3-lewis-testing-tools.git ttcn-3-lewis-testing-tools
-cd ./ttcn-3-lewis-testing-tools
-pip3 install -r ./requirements.txt
-
-cd ${HOME}
-
-exit 0
diff --git a/docker/home/etc/init.d/50-stf569.sh b/docker/home/etc/init.d/40-stf569.sh
similarity index 85%
rename from docker/home/etc/init.d/50-stf569.sh
rename to docker/home/etc/init.d/40-stf569.sh
index 5b0c0fd..b49b6b3 100755
--- a/docker/home/etc/init.d/50-stf569.sh
+++ b/docker/home/etc/init.d/40-stf569.sh
@@ -3,7 +3,7 @@
 echo -e "*****************************\n* Checkout STF569 sources\n*****************************\n"
 mkdir -p ${HOME}/dev && cd ${HOME}/dev || exit 1
 
-git clone --recurse-submodules -b latest-open-draft --single-branch https://forge.etsi.org/rep/mec/gs032p3-ttcn-test-suite.git STF569_Mec
+git clone --recurse-submodules -b devel --single-branch https://forge.etsi.org/rep/mec/gs032p3-ttcn-test-suite.git STF569_Mec
 cd /home/etsi/dev/STF569_Mec/ttcn
 git clone https://forge.etsi.org/gitlab/LIBS/LibCommon.git ./LibCommon
 git clone -bTTF0002 https://forge.etsi.org/gitlab/LIBS/LibIts ./LibIts
@@ -19,8 +19,6 @@ ls -ltr /home/etsi
 export HOME=/home/etsi
 . /home/etsi/devenv.bash
 cd /home/etsi/dev/STF569_Mec/scripts
-./build_titan.bash
-. /home/etsi/devenv.bash
 ./update_mec_project.bash
 cd /home/etsi/dev/etsi_mec/src/AtsMec/objs
 ../bin/mec_generate_makefile.bash
diff --git a/scripts/update_mec_project.bash b/scripts/update_mec_project.bash
index a4f73b7..d52be51 100755
--- a/scripts/update_mec_project.bash
+++ b/scripts/update_mec_project.bash
@@ -22,7 +22,7 @@ SRC_MEC_PATH=${VALIDATION_DIR}/dev/STF569_Mec
 
 if [ "${PATH_DEV_MEC}" == "" ]
 then
-    PATH_DEV_MEC=`pwd`/../etsi_mec
+    PATH_DEV_MEC=${HOME}/dev/etsi_mec
 fi
 echo ${PATH_DEV_MEC}
 
-- 
GitLab