aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPau Espin Pedrol <pespin@sysmocom.de>2021-12-13 18:01:34 +0100
committerpespin <pespin@sysmocom.de>2021-12-15 14:39:32 +0000
commitb9e45af675d35e5491718e4f2332c5732f14734f (patch)
tree9035a209f2caccb7c6c5ce7c13f9c821e0e5f332
parent709a30b536ae9f725f675edcfe3ba855fee0e577 (diff)
hnodeb: Update Dockerfile, configs with new deps, configs
Pull in libgtp, configure LL socket, etc. Change-Id: I5b223149cbbea16e4ccd9b3874874c6366fe7969
-rw-r--r--osmo-hnodeb-master/Dockerfile1
-rw-r--r--ttcn3-hnodeb-test/HNB_Tests.cfg1
-rwxr-xr-xttcn3-hnodeb-test/jenkins.sh6
-rw-r--r--ttcn3-hnodeb-test/osmo-hnodeb.cfg4
4 files changed, 12 insertions, 0 deletions
diff --git a/osmo-hnodeb-master/Dockerfile b/osmo-hnodeb-master/Dockerfile
index 1a3ded9..a7ff068 100644
--- a/osmo-hnodeb-master/Dockerfile
+++ b/osmo-hnodeb-master/Dockerfile
@@ -10,6 +10,7 @@ RUN apt-get update && \
libosmo-abis-dev \
libosmo-netif-dev \
libosmo-sigtran-dev \
+ libgtp-dev \
libasn1c-dev && \
apt-get clean
diff --git a/ttcn3-hnodeb-test/HNB_Tests.cfg b/ttcn3-hnodeb-test/HNB_Tests.cfg
index 9190e1b..677e12b 100644
--- a/ttcn3-hnodeb-test/HNB_Tests.cfg
+++ b/ttcn3-hnodeb-test/HNB_Tests.cfg
@@ -12,6 +12,7 @@
[MODULE_PARAMETERS]
HNB_Tests.mp_hnodeb_ip := "172.18.33.20";
HNB_Tests.mp_hnbgw_iuh_ip := "172.18.33.203";
+HNB_Tests.mp_hnbllif_sk_path := "/data/unix/ll_sock";
[MAIN_CONTROLLER]
diff --git a/ttcn3-hnodeb-test/jenkins.sh b/ttcn3-hnodeb-test/jenkins.sh
index 8bcfbf4..358280d 100755
--- a/ttcn3-hnodeb-test/jenkins.sh
+++ b/ttcn3-hnodeb-test/jenkins.sh
@@ -10,12 +10,16 @@ set_clean_up_trap
set -e
mkdir $VOL_BASE_DIR/hnodeb-tester
+mkdir $VOL_BASE_DIR/hnodeb-tester/unix
cp HNB_Tests.cfg $VOL_BASE_DIR/hnodeb-tester/
write_mp_osmo_repo "$VOL_BASE_DIR/hnodeb-tester/HNB_Tests.cfg"
mkdir $VOL_BASE_DIR/hnodeb
+mkdir $VOL_BASE_DIR/hnodeb/unix
cp osmo-hnodeb.cfg $VOL_BASE_DIR/hnodeb/
+mkdir $VOL_BASE_DIR/unix
+
SUBNET=33
network_create $SUBNET
@@ -24,6 +28,7 @@ docker run --rm \
$(docker_network_params $SUBNET 20) \
--ulimit core=-1 \
-v $VOL_BASE_DIR/hnodeb:/data \
+ -v $VOL_BASE_DIR/unix:/data/unix \
--name ${BUILD_TAG}-hnodeb -d \
$DOCKER_ARGS \
$REPO_USER/osmo-hnodeb-$IMAGE_SUFFIX
@@ -34,6 +39,7 @@ docker run --rm \
--ulimit core=-1 \
-e "TTCN3_PCAP_PATH=/data" \
-v $VOL_BASE_DIR/hnodeb-tester:/data \
+ -v $VOL_BASE_DIR/unix:/data/unix \
--name ${BUILD_TAG}-ttcn3-hnodeb-test \
$DOCKER_ARGS \
$REPO_USER/ttcn3-hnodeb-test
diff --git a/ttcn3-hnodeb-test/osmo-hnodeb.cfg b/ttcn3-hnodeb-test/osmo-hnodeb.cfg
index e3925e8..7d24700 100644
--- a/ttcn3-hnodeb-test/osmo-hnodeb.cfg
+++ b/ttcn3-hnodeb-test/osmo-hnodeb.cfg
@@ -23,3 +23,7 @@ hnodeb
iuh
local-ip 172.18.33.20
remote-ip 172.18.33.203
+ ll-socket
+ path /data/unix/ll_sock
+ gtp
+ local-ip 172.18.33.20