Bug fixed in virtulization scripts

scripts/update_user_name.sh

+#!/bin/bash
+
+# Debug mode
+#set -e
+#set -vx
+
+# Usage: sudo ./update_user_name.bash
+# TODO Use git clone in temporary directory
+
+USER_NAME='s/vagrant/etsi/g'
+for i in `find /home/etsi/dev/TTF0002_Its -name "*.cf*"`
+do
+  sed --in-place ${USER_NAME} $i
+done
+
+exit 0

virtualization/docker/home/etc/init.d/40-ttf_t012.sh

@@ -18,6 +18,7 @@ echo -e "*****************************\n* Set up environment\n******************
 cd /home/etsi/dev/TTF_T012_Mec/scripts
 ln -sf /home/etsi/dev/TTF_T012_Mec/scripts/devenv.bash.ubuntu /home/etsi/devenv.bash
 . /home/etsi/devenv.bash
+
 echo -e "*****************************\n* Apply patched \n*****************************\n"
 cd /home/etsi/dev/TTF_T012_Mec
 cp ./ttcn/patch_lib_common_titan/module.mk ./ttcn/LibCommon/
@@ -25,20 +26,21 @@ cp ./ttcn/patch_lib_common_titan/*.ttcn ./ttcn/LibCommon/ttcn
 cp  ./ttcn/patch_lib_http/*.ttcn ./ttcn/LibIts/ttcn/Http/
 cp  ./ttcn/patch_lib_its/module.mk ./ttcn/LibIts/
 
+echo -e "*****************************\n* Change user in cfg files\n*****************************\n"
+. /home/etsi/devenv.bash
+cd ${HOME}/dev/TTF011_Its/scripts || exit 1
+./update_user_name.sh || exit 1
+
 echo -e "*****************************\n* Build Mec test suite\n*****************************\n"
 export ATS=AtsMec
 make
 
-echo -e "*****************************\n* Init Eclipse Workspace\n*****************************\n"
-
-echo -e "*****************************\n* Setup a configuration file\n*****************************\n"
 cd ./etc/AtsMec
 ln -sf AtsMec_Sandbox.cf_ AtsMec.cfg
-cd -
 
 echo -e "*****************************\n* Change sudo in command line\n*****************************\n"
-cd /home/etsi/dev/TTF_T012_Mec/scripts
-export ATS=AtsMec
-#sed --in-place 's/sudo/echo "etsi" \| sudo -S/' ./run_all.bash
+cd /home/etsi/dev/TTF011_Its/scripts
+sed --in-place 's/sudo/echo "etsi" \| sudo -S/' ./run_mtc.bash
+sed --in-place 's/sudo/echo "etsi" \| sudo -S/' ./run_ptcs.bash
 
 cd /home/etsi/dev/TTF_T012_Mec

virtualization/vagrant/provisioner.bash

@@ -73,27 +73,34 @@ then
     exit -1
 fi
 
+# Clone project
 cd /home/vagrant/dev
-git clone https://forge.etsi.org/gitlab/mec/gs032p3-ttcn-test-suite.git ./STF569_Mec
-cd /home/vagrant/dev/STF569_Mec
-cd /home/vagrant/dev/STF569_Mec/ttcn
-git clone https://forge.etsi.org/gitlab/LIBS/LibSip.git ./LibSip
-git clone https://forge.etsi.org/gitlab/LIBS/LibIms.git ./LibIms
+git clone https://forge.etsi.org/gitlab/mec/gs032p3-ttcn-test-suite.git ./TTF_T012_Mec
+cd /home/vagrant/dev/TTF_T012_Mec
+git clone --recurse-submodules -b v2.2.1-dev --single-branch https://forge.etsi.org/rep/mec/gs032p3-ttcn-test-suite.git TTF_T012_Mec
+cd /home/etsi/dev/TTF_T012_Mec/ttcn
 git clone https://forge.etsi.org/gitlab/LIBS/LibCommon.git ./LibCommon
-git clone -bSTF525 https://forge.etsi.org/gitlab/LIBS/LibIts ./LibIt
-cd /home/etsi/dev/STF569_Mec/ttcn/LibIts
+git clone -bTTF0002 https://forge.etsi.org/gitlab/LIBS/LibIts ./LibIts
+cd /home/etsi/dev/TTF_T012_Mec/ttcn/LibIts
 rm -fr asn1 t3q xsd
-cd ttcn && rm -fr BTP CALM CAM Common DCC DENM GeoNetworking Ipv6OverGeoNetworking IVIM MapemSpatem Pki Security SremSsem V2G
-cd /home/vagrant/dev/STF569_Mec/scripts
+cd ttcn && rm -fr BTP CAM Common DENM GeoNetworking Ipv6OverGeoNetworking IVIM MapemSpatem Pki Security SremSsem Rtcmem
+cd /home/vagrant/dev/TTF_T012_Mec/scripts
 chmod 775 *.bash devenv.bash.*
-cd /home/vagrant/dev/STF569_Mec/docker
+cd /home/vagrant/dev/TTF_T012_Mec/virtualization/docker
 chmod 775 *.sh
-cd /home/vagrant/dev/STF569_Mec
+cd /home/vagrant/dev/TTF_T012_Mec
 chmod 775 ./.jenkins.sh
 cd /home/vagrant
-ln -sf /home/vagrant/dev/STF569_Mec/scripts/devenv.bash.ubuntu /home/vagrant/devenv.bash
+ln -sf /home/vagrant/dev/TTF_T012_Mec/scripts/devenv.bash.ubuntu /home/vagrant/devenv.bash
 . /home/vagrant/devenv.bash
 
+# Apply patch
+cd /home/etsi/dev/TTF_T012_Mec
+cp ./ttcn/patch_lib_common_titan/module.mk ./ttcn/LibCommon/
+cp ./ttcn/patch_lib_common_titan/*.ttcn ./ttcn/LibCommon/ttcn
+cp  ./ttcn/patch_lib_http/*.ttcn ./ttcn/LibIts/ttcn/Http/
+cp  ./ttcn/patch_lib_its/module.mk ./ttcn/LibIts/
+
 # Install all frameworks
 
 # Install osip
@@ -126,26 +133,42 @@ sudo gem install coveralls-lcov
 lcov --version
 coveralls-lcov -h
 
-# Install eclipse
-cd ${HOME_FRAMEWORKS}
-wget 'http://ftp.halifax.rwth-aachen.de/eclipse/technology/epp/downloads/release/oxygen/2/eclipse-cpp-oxygen-2-linux-gtk-x86_64.tar.gz' -Oeclipse-cpp-oxygen-2-linux-gtk-x86_64.tar.gz
-tar -zxvf ./eclipse-cpp-oxygen-2-linux-gtk-x86_64.tar.gz
-rm -f ./eclipse-cpp-oxygen-2-linux-gtk-x86_64.tar.gz
-
 cd /home/vagrant
 echo "" >> /home/vagrant/.bashrc
 echo "export LD_LIBRARY_PATH=/home/vagrant/dev/etsi_mec/lib:$LD_LIBRARY_PATH" >> /home/vagrant/.bashrc
 echo "export PATH=/home/vagrant/bin:$PATH" >> /home/vagrant/.bashrc
 echo ". ~/devenv.bash" >> /home/vagrant/.bashrc
 
-. /home/vagrant/.bashrc
-cd /home/vagrant/dev/STF569_Mec/scripts
+# Install eclipse
+cd ${HOME_FRAMEWORKS}
+cd ${HOME}/frameworks || exit 1
+wget --progress=dot:mega 'http://www.mirrorservice.org/sites/download.eclipse.org/eclipseMirror/technology/epp/downloads/release/2020-06/R/eclipse-cpp-2020-06-R-linux-gtk-x86_64.tar.gz' -Oeclipse-cpp-2020-06-R-linux-gtk-x86_64.tar.gz || exit 1
+tar -zxvf ./eclipse-cpp-2020-06-R-linux-gtk-x86_64.tar.gz || exit 1
+ln -sf ${HOME}/frameworks/eclipse/eclipse ${HOME}/bin/eclipse
+rm -f ./eclipse-cpp-2020-06-R-linux-gtk-x86_64.tar.gz
+
+if wget --progress=dot:mega 'https://www.eclipse.org/downloads/download.php?file=/titan/TITAN_Designer_and_Executor_plugin-8.1.0.zip' -OTITAN_Designer_and_Executor_plugin.zip; then
+  eclipse/eclipse -noSplash -application org.eclipse.equinox.p2.director \
+    -destination /home/etsi/frameworks/eclipse \
+    -repository 'jar:file:///home/etsi/frameworks/TITAN_Designer_and_Executor_plugin.zip!/' \
+    -installIU TITAN_Designer.feature.group,TITAN_Executor.feature.group,TITAN_Log_Viewer.feature.group,Titan_external_dependencies.feature.group,Titanium.feature.group,Titanium_external_dependencies.feature.group
+  rm -f TITAN_Designer_and_Executor_plugin.zip
+fi
+
+# Build Titan
+cd /home/vagrant/dev/TTF012_Mec/scripts
 ./build_titan.bash
 . /home/vagrant/devenv.bash
-./update_its_project.bash
-cd /home/vagrant/dev/etsi_emco/src/TestCodec/objs
-../bin/testcodec_generate_makefile.bash
-../bin/run_all.bash
+
+# Build ATSs
+cd /home/vagrant/dev/TTF012_Mec
+export ATS=AtsMec
+make
+
+# Update configuration file
+cd ./etc/AtsMec
+ln -sf AtsMec_Sandbox.cf_ AtsMec.cfg
+cd -
 
 cd ${OLD_PWD}