Commit 09fd04ec authored by YannGarcia's avatar YannGarcia
Browse files

Bug fixed in virtulization scripts

parent 561da360

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

+5 −6
Original line number Original line Diff line number Diff line
@@ -9,10 +9,10 @@ mkdir -p ${HOME}/dev && cd ${HOME}/dev || exit 1 
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

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

cd /home/etsi/dev/TTF_T012_Mec/ttcn

git clone https://forge.etsi.org/gitlab/LIBS/LibCommon.git ./LibCommon

git clone https://forge.etsi.org/gitlab/LIBS/LibCommon.git ./LibCommon

git clone -bTTF0002 https://forge.etsi.org/gitlab/LIBS/LibIts ./LibIts

git clone -bTTF011 https://forge.etsi.org/gitlab/LIBS/LibIts ./LibIts

cd /home/etsi/dev/TTF_T012_Mec/ttcn/LibIts

cd /home/etsi/dev/TTF_T012_Mec/ttcn/LibIts

rm -fr asn1 t3q xsd

rm -fr t3q

cd ttcn && rm -fr BTP CAM Common DENM GeoNetworking Ipv6OverGeoNetworking IVIM MapemSpatem Pki Security SremSsem Rtcmem

cd ttcn && rm -fr Common





echo -e "*****************************\n* Set up environment\n*****************************\n"

echo -e "*****************************\n* Set up environment\n*****************************\n"

cd /home/etsi/dev/TTF_T012_Mec/scripts

cd /home/etsi/dev/TTF_T012_Mec/scripts
@@ -27,8 +27,7 @@ cp ./ttcn/patch_lib_http/*.ttcn ./ttcn/LibIts/ttcn/Http/ 
cp  ./ttcn/patch_lib_its/module.mk ./ttcn/LibIts/

cp  ./ttcn/patch_lib_its/module.mk ./ttcn/LibIts/





echo -e "*****************************\n* Change user in cfg files\n*****************************\n"

echo -e "*****************************\n* Change user in cfg files\n*****************************\n"

. /home/etsi/devenv.bash

cd ${HOME}/dev/TTF012_Its/scripts || exit 1

cd ${HOME}/dev/TTF011_Its/scripts || exit 1

./update_user_name.sh || exit 1

./update_user_name.sh || exit 1





echo -e "*****************************\n* Build Mec test suite\n*****************************\n"

echo -e "*****************************\n* Build Mec test suite\n*****************************\n"
@@ -39,7 +38,7 @@ cd ./etc/AtsMec 
ln -sf AtsMec_Sandbox.cf_ AtsMec.cfg

ln -sf AtsMec_Sandbox.cf_ AtsMec.cfg





echo -e "*****************************\n* Change sudo in command line\n*****************************\n"

echo -e "*****************************\n* Change sudo in command line\n*****************************\n"

cd /home/etsi/dev/TTF011_Its/scripts

cd /home/etsi/dev/TTF012_Its/scripts

sed --in-place 's/sudo/echo "etsi" \| sudo -S/' ./run_mtc.bash

sed --in-place 's/sudo/echo "etsi" \| sudo -S/' ./run_mtc.bash

sed --in-place 's/sudo/echo "etsi" \| sudo -S/' ./run_ptcs.bash

sed --in-place 's/sudo/echo "etsi" \| sudo -S/' ./run_ptcs.bash

virtualization/vagrant/provisioner.bash

+18 −9
Original line number Original line Diff line number Diff line
@@ -73,6 +73,12 @@ then 
    exit -1

    exit -1

fi

fi





cd /home/vagrant

echo "" >> /home/vagrant/.bashrc

echo "export LD_LIBRARY_PATH=/home/vagrant/lib:$LD_LIBRARY_PATH" >> /home/vagrant/.bashrc

echo "export PATH=/home/vagrant/bin:$PATH" >> /home/vagrant/.bashrc

echo ". ~/devenv.bash" >> /home/vagrant/.bashrc



# Clone project

# Clone project

cd /home/vagrant/dev

cd /home/vagrant/dev

git clone https://forge.etsi.org/gitlab/mec/gs032p3-ttcn-test-suite.git ./TTF_T012_Mec

git clone https://forge.etsi.org/gitlab/mec/gs032p3-ttcn-test-suite.git ./TTF_T012_Mec
@@ -80,10 +86,10 @@ 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

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/vagrant/dev/TTF_T012_Mec/ttcn

cd /home/vagrant/dev/TTF_T012_Mec/ttcn

git clone https://forge.etsi.org/gitlab/LIBS/LibCommon.git ./LibCommon

git clone https://forge.etsi.org/gitlab/LIBS/LibCommon.git ./LibCommon

git clone -bTTF0002 https://forge.etsi.org/gitlab/LIBS/LibIts ./LibIts

git clone -bTTF011 https://forge.etsi.org/gitlab/LIBS/LibIts ./LibIts

cd /home/vagrant/dev/TTF_T012_Mec/ttcn/LibIts

cd /home/vagrant/dev/TTF_T012_Mec/ttcn/LibIts

rm -fr asn1 t3q xsd

rm -fr t3q

cd ttcn && rm -fr BTP CAM Common DENM GeoNetworking Ipv6OverGeoNetworking IVIM MapemSpatem Pki Security SremSsem Rtcmem

cd ttcn && rm -fr Common

cd /home/vagrant/dev/TTF_T012_Mec/scripts

cd /home/vagrant/dev/TTF_T012_Mec/scripts

chmod 775 *.bash devenv.bash.*

chmod 775 *.bash devenv.bash.*

cd /home/vagrant/dev/TTF_T012_Mec/virtualization/docker

cd /home/vagrant/dev/TTF_T012_Mec/virtualization/docker
@@ -101,6 +107,10 @@ cp ./ttcn/patch_lib_common_titan/*.ttcn ./ttcn/LibCommon/ttcn 
cp  ./ttcn/patch_lib_http/*.ttcn ./ttcn/LibIts/ttcn/Http/

cp  ./ttcn/patch_lib_http/*.ttcn ./ttcn/LibIts/ttcn/Http/

cp  ./ttcn/patch_lib_its/module.mk ./ttcn/LibIts/

cp  ./ttcn/patch_lib_its/module.mk ./ttcn/LibIts/





# Change user in cfg files

cd ${HOME}/dev/TTF012_Its/scripts || exit 1

./update_user_name.sh || exit 1



# Install all frameworks

# Install all frameworks





# Install osip

# Install osip
@@ -133,12 +143,6 @@ sudo gem install coveralls-lcov 
lcov --version

lcov --version

coveralls-lcov -h

coveralls-lcov -h





cd /home/vagrant

echo "" >> /home/vagrant/.bashrc

echo "export LD_LIBRARY_PATH=/home/vagrant/lib:$LD_LIBRARY_PATH" >> /home/vagrant/.bashrc

echo "export PATH=/home/vagrant/bin:$PATH" >> /home/vagrant/.bashrc

echo ". ~/devenv.bash" >> /home/vagrant/.bashrc



# Install eclipse

# Install eclipse

cd ${HOME}/frameworks

cd ${HOME}/frameworks

wget --progress=dot:mega 'http://www.mirrorservice.org/sites/download.eclipse.org/eclipseMirror/technology/epp/downloads/release/2021-12/R/eclipse-cpp-2021-12-R-linux-gtk-x86_64.tar.gz' -Oeclipse-cpp-2021-12-R-linux-gtk-x86_64.tar.gz || exit 1

wget --progress=dot:mega 'http://www.mirrorservice.org/sites/download.eclipse.org/eclipseMirror/technology/epp/downloads/release/2021-12/R/eclipse-cpp-2021-12-R-linux-gtk-x86_64.tar.gz' -Oeclipse-cpp-2021-12-R-linux-gtk-x86_64.tar.gz || exit 1
@@ -169,6 +173,11 @@ cd ./etc/AtsMec 
ln -sf AtsMec_Sandbox.cf_ AtsMec.cfg

ln -sf AtsMec_Sandbox.cf_ AtsMec.cfg

cd -

cd -





# Change sudo in command line

cd /home/etsi/dev/TTF012_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 ${OLD_PWD}

cd ${OLD_PWD}





sudo init 6

sudo init 6