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 986c58d475a4be2dbf5ce8d13a3eb3a4b2502c49..0000000000000000000000000000000000000000 --- 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 5b0c0fdd479228e3b67cd7b1aaf7422109cda6c1..b49b6b31e98377f89aa5fa63a541cd8b0f3ef994 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 a4f73b7fe30e332ec2df51152db9e0710b0288ce..d52be516a12c8da08aad79be62db0677dbdcf6db 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}