Update Docker support (ce699525) · Commits · MEC - Multi-access Edge Computing / MEC TTCN-3 Test Suite

.jenkins.sh

+5 −9

Original line number	Original line	Diff line number	Diff line
	@@ -2,18 +2,14 @@
	# Copyright ETSI 2018		# Copyright ETSI 2018
	# See: https://forge.etsi.org/etsi-forge-copyright-statement.txt		# See: https://forge.etsi.org/etsi-forge-copyright-statement.txt

	#set -vx		set -vx
	#set -e		#set -e

	cd "$(dirname "$0")"		cd $(dirname $0)

	cd ./docker		run_dir=`pwd`
	run_dir="$(pwd)"

			# Docker version 2
			cd docker
	./build.sh		./build.sh
	#./run.sh		#./run.sh

	cd -

	exit 0

ccsrc/Protocols/Http/http_codec.cc

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -57,6 +57,9 @@ int http_codec::decode (const OCTETSTRING& data, LibItsHttp__TypesAndValues::Htt
	return -1;		return -1;
	}		}
	loggers::get_instance().log_msg("http_codec::decode: message_id: ", message_id);		loggers::get_instance().log_msg("http_codec::decode: message_id: ", message_id);
			if (message_id.lengthof() < 6) { // HTTP/
			return -1;
			}
	// Extract parameters		// Extract parameters
	try {		try {
	std::string str(static_cast<const char*>(message_id));		std::string str(static_cast<const char*>(message_id));

docker/Dockerfile.stfubuntu

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -13,7 +13,7 @@ RUN echo "docker-STF-dev" > /etc/hostname \
	&& DEBIAN_FRONTEND=noninteractive apt-get install software-properties-common -y \		&& DEBIAN_FRONTEND=noninteractive apt-get install software-properties-common -y \
	&& DEBIAN_FRONTEND=noninteractive add-apt-repository ppa:linuxuprising/java -y \		&& DEBIAN_FRONTEND=noninteractive add-apt-repository ppa:linuxuprising/java -y \
	&& DEBIAN_FRONTEND=noninteractive apt-get update \		&& DEBIAN_FRONTEND=noninteractive apt-get update \
	&& ( echo "oracle-java15-installer shared/accepted-oracle-license-v1-2 boolean true" \| debconf-set-selections -v ) \		&& ( echo "oracle-java16-installer shared/accepted-oracle-license-v1-2 boolean true" \| debconf-set-selections -v ) \
	&& DEBIAN_FRONTEND=noninteractive apt-get --allow-unauthenticated install -y \		&& DEBIAN_FRONTEND=noninteractive apt-get --allow-unauthenticated install -y \
	autoconf \		autoconf \
	bison \		bison \
	@@ -51,8 +51,8 @@ RUN echo "docker-STF-dev" > /etc/hostname \
	lsof \		lsof \
	net-tools \		net-tools \
	ntp \		ntp \
	oracle-java15-installer \		oracle-java16-installer \
	oracle-java15-set-default \		oracle-java16-set-default \
	openssh-server \		openssh-server \
	pkg-config \		pkg-config \
	python3-dev \		python3-dev \

docker/home/etc/init.d/20-eclipse.sh

+10 −6

Original line number	Original line	Diff line number	Diff line
	#!/bin/bash		#!/bin/bash

			ECLIPSE_URL='https://www.eclipse.org/downloads/download.php?file=/technology/epp/downloads/release/2020-06/R/eclipse-jee-2020-06-R-linux-gtk-x86_64.tar.gz&r=1'
			TITAN_URL='https://www.eclipse.org/downloads/download.php?file=/titan/TITAN_Designer_and_Executor_Plugin_7.1.0.zip&r=1'

	#set -e		#set -e
	set -vx		set -vx

	echo -e "****************************\n Install eclipse\n*****************************\n"		echo -e "****************************\n Install eclipse\n*****************************\n"

	mkdir -p ${HOME}/frameworks		mkdir -p ${HOME}/frameworks
	cd ${HOME}/frameworks \|\| exit 1		cd ${HOME}/frameworks \|\| exit 1
	wget --progress=dot:mega 'https://www.eclipse.org/downloads/download.php?file=/technology/epp/downloads/release/helios/SR2/eclipse-cpp-helios-SR2-linux-gtk-x86_64.tar.gz' -Oeclipse-cpp-helios-SR2-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/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-helios-SR2-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		ln -sf ${HOME}/frameworks/eclipse/eclipse ${HOME}/bin/eclipse
	rm -f ./eclipse-cpp-helios-SR2-linux-gtk-x86_64.tar.gz		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-6.4.pl0.zip&r=1' -OTITAN_Designer_and_Executor_plugin.zip; then		if wget --progress=dot:mega 'https://mirrors.dotsrc.org/eclipse//titan/TITAN_Designer_and_Executor_Plugin_7.1.0.zip' -OTITAN_Designer_and_Executor_plugin.zip; then
	eclipse/eclipse -noSplash -application org.eclipse.equinox.p2.director \		eclipse/eclipse -noSplash -application org.eclipse.equinox.p2.director \
	-destination ${HOME}/frameworks/eclipse \		-destination /home/etsi/frameworks/eclipse \
	-repository jar:file://${HOME}/frameworks/TITAN_Designer_and_Executor_plugin.zip!/ \		-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		-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		rm -f TITAN_Designer_and_Executor_plugin.zip
	fi		fi

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -6,7 +6,7 @@ set -vx
	echo -e "****************************\n Checkout TTF T012 sources\n*****************************\n"		echo -e "****************************\n Checkout TTF T012 sources\n*****************************\n"
	mkdir -p ${HOME}/dev && cd ${HOME}/dev \|\| exit 1		mkdir -p ${HOME}/dev && cd ${HOME}/dev \|\| exit 1

	git clone --recurse-submodules -b ttf_t012 --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 -bTTF0002 https://forge.etsi.org/gitlab/LIBS/LibIts ./LibIts

Admin message