From db9514e2fe660a26156cfdf0d790d6713ad93ce7 Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Thu, 11 Jun 2020 17:17:21 +0200 Subject: [PATCH] osmo-gsm-tester: Update resources.conf syntax changes Change-Id: Iaa3e43d6878933b1f01026d58b01b1009fe4cd78 --- osmo-gsm-tester/jenkins.sh | 2 +- osmo-gsm-tester/resources.conf | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/osmo-gsm-tester/jenkins.sh b/osmo-gsm-tester/jenkins.sh index 64de38fa..a1986082 100755 --- a/osmo-gsm-tester/jenkins.sh +++ b/osmo-gsm-tester/jenkins.sh @@ -81,7 +81,7 @@ docker run --rm \ echo Starting container with osmo-gsm-tester main unit OSMO_GSM_TESTER_CONF=${OSMO_GSM_TESTER_CONF:-/tmp/osmo-gsm-tester/sysmocom/main.conf} -OSMO_GSM_TESTER_OPTS=${OSMO_GSM_TESTER_OPTS:--T -l dbg -s 4g:srsenb-rftype@zmq+srsue-rftype@zmq -t ping} +OSMO_GSM_TESTER_OPTS=${OSMO_GSM_TESTER_OPTS:--T -l dbg -s 4g:srsue-rftype@zmq+srsenb-rftype@zmq+mod-enb-nprb@6 -t =ping.py} docker run --rm \ --cap-add=NET_ADMIN \ --cap-add=SYS_ADMIN \ diff --git a/osmo-gsm-tester/resources.conf b/osmo-gsm-tester/resources.conf index a687edb6..22ff85ed 100644 --- a/osmo-gsm-tester/resources.conf +++ b/osmo-gsm-tester/resources.conf @@ -37,8 +37,11 @@ enb: - label: srsENB-zmq type: srsenb rf_dev_type: zmq - remote_user: jenkins - addr: 172.18.50.101 + run_node: + run_type: ssh + run_addr: 172.18.50.101 + ssh_user: jenkins + ssh_addr: 172.18.50.101 arfcn: - arfcn: 512 @@ -55,9 +58,12 @@ modem: - label: srsUE-zmq_1 type: srsue rf_dev_type: zmq - remote_user: jenkins - addr: 172.18.50.100 imsi: '001010123456789' ki: '00112233445566778899aabbccddeeff' auth_algo: 'xor' features: ['4g'] + run_node: + run_type: ssh + run_addr: 172.18.50.100 + ssh_user: jenkins + ssh_addr: 172.18.50.100