Commit 0b447bc2 authored by Yann Garcia's avatar Yann Garcia
Browse files

Merge branch 'TTF_T042' into 'master' 

Closing TTF T042

See merge request !9
parents 53767434 173a653c

.clang-format

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ BreakConstructorInitializersBeforeComma: false 
BreakConstructorInitializers: BeforeColon

BreakAfterJavaFieldAnnotations: false

BreakStringLiterals: true

ColumnLimit:     160

ColumnLimit:     180

CommentPragmas:  '^ IWYU pragma:'

CompactNamespaces: false

ConstructorInitializerAllOnOneLineOrOnePerLine: false

.gitignore

100755 → 100644
+8 −3
Original line number Diff line number Diff line 
build

build

bin

config.mk

data/certificates/*

!data/certificates/profiles

!data/certificates/Makefile

package.yml

.gitignore

.gitmodules

+58 −42
Original line number Diff line number Diff line
@@ -4,23 +4,23 @@ 
[submodule "ttcn/LibIts"]

	path = ttcn/LibIts

	url = https://forge.etsi.org/rep/LIBS/LibIts.git

	branch = devel

	branch = devel2

[submodule "ttcn/AtsCAM"]

	path = ttcn/AtsCAM

	url = https://forge.etsi.org/rep/ITS/ttcn/ats_cam_ts102868-3.git

	branch = devel

	branch = TTF_T036

[submodule "ttcn/AtsDENM"]

	path = ttcn/AtsDENM

	url = https://forge.etsi.org/rep/ITS/ttcn/ats_denm_ts102869-3.git

	branch = devel

	branch = TTF_T036

[submodule "ttcn/AtsGeoNetworking"]

	path = ttcn/AtsGeoNetworking

	url = https://forge.etsi.org/rep/ITS/ttcn/ats_gn_ts102871-3.git

	branch = devel

	branch = TTF_T036

[submodule "ttcn/AtsBTP"]

	path = ttcn/AtsBTP

	url = https://forge.etsi.org/rep/ITS/ttcn/ats_btp_ts102870-3.git

	branch = devel

	branch = TTF_T036

[submodule "ttcn/AtsIPv6OverGeoNetworking"]

	path = ttcn/AtsIPv6OverGeoNetworking

	url = https://forge.etsi.org/rep/ITS/ttcn/ats_gnipv6_ts102859-3.git
@@ -28,15 +28,31 @@ 
[submodule "ttcn/AtsPki"]

	path = ttcn/AtsPki

	url = https://forge.etsi.org/rep/ITS/ttcn/ats_pki_ts103525-3.git

	branch = devel

	branch = TTF_T036

[submodule "ttcn/AtsIS"]

	path = ttcn/AtsIS

	url = https://forge.etsi.org/rep/ITS/ttcn/ats_ts103191-3.git

	branch = devel

	branch = TTF_T036

[submodule "ttcn/AtsSecurity"]

	path = ttcn/AtsSecurity

	url = https://forge.etsi.org/rep/ITS/ttcn/ats_sec_ts103096-3.git

	branch = devel

	branch = TTF_T036

[submodule "ttcn/modules/titan.TestPorts.Common_Components.Abstract_Socket/module"]

	path = ttcn/modules/titan.TestPorts.Common_Components.Abstract_Socket/module

	url = https://github.com/eclipse/titan.TestPorts.Common_Components.Abstract_Socket.git
 
	url = https://gitlab.eclipse.org/eclipse/titan/titan.TestPorts.Common_Components.Abstract_Socket

[submodule "titan-test-system-framework"]

	path = titan-test-system-framework

	url = https://labs.etsi.org/rep/cti-tools/titan-test-system-framework.git

	branch = devel

[submodule "ttcn/AtsMBR"]

	path = ttcn/AtsMBR

	url = https://forge.etsi.org/rep/ITS/ttcn/mbr_ts_103759.git

	branch = devel2

[submodule "ttcn/AtsVRU"]

	path = ttcn/AtsVRU

	url = https://forge.etsi.org/rep/ITS/ttcn/vru-ts-104-018-3.git

	branch = TTF_T036

[submodule "ttcn/AtsCPS"]

	path = ttcn/AtsCPS

	url = https://forge.etsi.org/rep/ITS/ttcn/cps-ts-104-019-3.git

	branch = TTF_T036

.jenkins.sh

+2 −2
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ cd $(dirname $0) 
run_dir=`pwd`



# Docker version 2

cd ./virtualization/docker

cd ./virtualization/docker-dev

./build.sh #--force-stfubuntu

ret_code=`echo $?`
@@ -24,7 +24,7 @@ fi 


if [ "$1" == "--remove" ]

then

    docker rmi --force etsiforge/etsi-its-ts:latest

    docker rmi --force etsiforge/etsi-its-ts-r2:latest

fi



cd $run_dir

LICENSE

+1 −1
Original line number Diff line number Diff line 
Copyright 2019 ETSI

Copyright 2019-2024 ETSI



Redistribution and use in source and binary forms, with or without 

modification, are permitted provided that the following conditions are met: