Remove LibIts submodule (ab2c2bd7) · Commits · MEC - Multi-access Edge Computing / MEC TTCN-3 Test Suite

.gitmodules

+0 −3

Original line number	Diff line number	Diff line
		[submodule "ttcn\\LibCommon"]
		path = ttcn\\LibCommon
		url = https://forge.etsi.org/rep/LIBS/LibCommon.git
		[submodule "ttcn\\LibIts"]
		path = ttcn\\LibIts
		url = https://forge.etsi.org/rep/LIBS/LibIts
		[submodule "titan-test-system-framework"]
		path = titan-test-system-framework
		url = https://labs.etsi.org/rep/cti-tools/titan-test-system-framework.git

LibIts @ 289f34c9

Original line number	Diff line number	Diff line
		Subproject commit 289f34c96c7b759615d5e9b56b385d74bb0d89cc

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

+5 −9

Original line number	Diff line number	Diff line
		@@ -7,12 +7,10 @@ echo -e "****************************\n Checkout mec_devel sources\n**********
		mkdir -p ${HOME}/dev && cd ${HOME}/dev \|\| exit 1

		git clone --recurse-submodules --branch devel --single-branch https://forge.etsi.org/rep/mec/gs032p3-ttcn-test-suite.git mec_devel
		cd /home/etsi/dev/mec_devel/titan-test-system-framework
		git checkout devel
		cd /home/etsi/dev/mec_devel/ttcn
		git clone https://forge.etsi.org/gitlab/LIBS/LibCommon.git ./LibCommon
		git clone --branch devel --single-branch https://forge.etsi.org/gitlab/LIBS/LibIts ./LibIts
		cd /home/etsi/dev/mec_devel/ttcn/LibIts
		rm -fr t3q
		cd ttcn && rm -fr Common

		echo -e "****************************\n Set up environment\n*****************************\n"
		cd /home/etsi/dev/mec_devel/scripts
		@@ -23,15 +21,13 @@ echo -e "****************************\n Apply patched \n**********************
		cd /home/etsi/dev/mec_devel
		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/

		echo -e "****************************\n Build Mec test suite\n*****************************\n"
		export ATS=AtsMec
		export ATS=AtsMec_Location
		make

		cd ./etc/AtsMec
		ln -sf AtsMec_Sandbox.cf_ AtsMec.cfg
		cd ./etc/AtsMec_Location
		ln -sf AtsMec_Sandbox.cf_ AtsMec_Location.cfg

		echo -e "****************************\n Change sudo in command line\n*****************************\n"
		cd /home/etsi/dev/mec_devel/scripts

virtualization/vagrant/provisioner.bash

+7 −9

Original line number	Diff line number	Diff line
		@@ -82,13 +82,13 @@ echo ". ~/devenv.bash" >> /home/vagrant/.bashrc

		# Clone project
		cd /home/vagrant/dev
		git clone --recurse-submodules --branch devel --single-branch https://forge.etsi.org/rep/mec/gs032p3-ttcn-test-suite.git ./mec_devel
		git clone --recurse-submodules --branch devel --single-branch https://forge.etsi.org/rep/mec/gs032p3-ttcn-test-suite.git mec_devel
		cd /home/vagrant/dev/mec_devel/titan-test-system-framework
		git checkout devel
		cd /home/vagrant/dev/mec_devel/ttcn
		git clone https://forge.etsi.org/gitlab/LIBS/LibCommon.git ./LibCommon
		git clone --branch devel --single-branch https://forge.etsi.org/gitlab/LIBS/LibIts ./LibIts
		cd /home/vagrant/dev/mec_devel/ttcn/LibIts
		rm -fr t3q
		cd ttcn && rm -fr Common

		# Set up environment
		cd /home/vagrant/dev/mec_devel/scripts
		chmod 775 .bash devenv.bash.
		cd /home/vagrant/dev/mec_devel/virtualization/docker
		@@ -103,8 +103,6 @@ ln -sf /home/vagrant/dev/mec_devel/scripts/devenv.bash.ubuntu /home/vagrant/deve
		cd /home/vagrant/dev/mec_devel
		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/

		# Change user in cfg files
		cd ${HOME}/dev/mec_devel/scripts \|\| exit 1
		@@ -166,7 +164,7 @@ cd /home/vagrant/dev/mec_devel/scripts

		# Build ATSs
		cd /home/vagrant/dev/mec_devel
		export ATS=AtsMec
		export ATS=AtsMec_Location
		make

		# Change user in cfg files
		@@ -175,7 +173,7 @@ cd /home/vagrant/dev/mec_devel/scripts

		# Update configuration file
		cd /home/vagrant/dev/mec_devel/etc/AtsMec
		ln -sf AtsMec_Sandbox.cf_ AtsMec.cfg
		ln -sf AtsMec_Sandbox.cf_ AtsMec_Location.cfg
		cd -

		# Change sudo in command line