This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
pespin gerrit-no-reply at lists.osmocom.orgpespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/17320 ) Change subject: osmo-gsm-tester: Improvements anv fixes to run 4G network with latest ogt version ...................................................................... osmo-gsm-tester: Improvements anv fixes to run 4G network with latest ogt version * Fix wrong KI. * Add an extra IP address to slave so that ENB and EPC can be run on different IP addresses and their GTP ports don't collide. * Add required rf parameters to resources.conf Change-Id: I0198bc99f75e9567ee717aa79e434ec28705fac9 --- M osmo-gsm-tester/Dockerfile M osmo-gsm-tester/jenkins.sh R osmo-gsm-tester/osmo-gsm-tester-master.sh A osmo-gsm-tester/osmo-gsm-tester-slave.sh M osmo-gsm-tester/resources.conf 5 files changed, 14 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/20/17320/1 diff --git a/osmo-gsm-tester/Dockerfile b/osmo-gsm-tester/Dockerfile index 6ed992e..859f0b1 100644 --- a/osmo-gsm-tester/Dockerfile +++ b/osmo-gsm-tester/Dockerfile @@ -134,6 +134,6 @@ ENV OSMO_GSM_TESTER_CONF /tmp/osmo-gsm-tester/example WORKDIR /data -CMD ["/bin/sh", "-c", "/data/osmo-gsm-tester.sh >/data/osmo-gsm-tester.log 2>&1"] +CMD ["/bin/sh", "-c", "/data/osmo-gsm-tester-master.sh >/data/osmo-gsm-tester.log 2>&1"] EXPOSE 22/tcp diff --git a/osmo-gsm-tester/jenkins.sh b/osmo-gsm-tester/jenkins.sh index 16552f9..248a10b 100755 --- a/osmo-gsm-tester/jenkins.sh +++ b/osmo-gsm-tester/jenkins.sh @@ -21,9 +21,10 @@ network_create 172.18.50.0/24 mkdir $VOL_BASE_DIR/ogt-slave +cp osmo-gsm-tester-slave.sh $VOL_BASE_DIR/ogt-slave/ mkdir $VOL_BASE_DIR/ogt-master -cp osmo-gsm-tester.sh $VOL_BASE_DIR/ogt-master/ +cp osmo-gsm-tester-master.sh $VOL_BASE_DIR/ogt-master/ echo Starting container with osmo-gsm-tester slave docker run --rm \ @@ -35,7 +36,7 @@ -v $VOL_BASE_DIR/ogt-slave:/data \ --name ${BUILD_TAG}-ogt-slave -d \ $REPO_USER/osmo-gsm-tester \ - /bin/sh -c "/usr/sbin/sshd -D -e >/data/sshd.log 2>&1" + /bin/sh -c "/data/osmo-gsm-tester-slave.sh >/data/sshd.log 2>&1" echo Starting container with osmo-gsm-tester main unit docker run --rm \ diff --git a/osmo-gsm-tester/osmo-gsm-tester.sh b/osmo-gsm-tester/osmo-gsm-tester-master.sh similarity index 100% rename from osmo-gsm-tester/osmo-gsm-tester.sh rename to osmo-gsm-tester/osmo-gsm-tester-master.sh diff --git a/osmo-gsm-tester/osmo-gsm-tester-slave.sh b/osmo-gsm-tester/osmo-gsm-tester-slave.sh new file mode 100755 index 0000000..3170922 --- /dev/null +++ b/osmo-gsm-tester/osmo-gsm-tester-slave.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +# Add local IP addresses required by osmo-gsm-tester resources: +ip addr add 172.18.50.101/24 dev eth0 + +/usr/sbin/sshd -D -e diff --git a/osmo-gsm-tester/resources.conf b/osmo-gsm-tester/resources.conf index 1120178..a81d92a 100644 --- a/osmo-gsm-tester/resources.conf +++ b/osmo-gsm-tester/resources.conf @@ -36,8 +36,9 @@ enb: - label: srsENB-zmq type: srsenb + rf_dev_type: zmq remote_user: jenkins - addr: 172.18.50.100 + addr: 172.18.50.101 arfcn: - arfcn: 512 @@ -53,8 +54,9 @@ - label: srsUE-zmq_1 type: srsue + rf_dev_type: zmq remote_user: jenkins addr: 172.18.50.100 imsi: '001010123456789' - ki: '8CCBE85A62C6DC7AC2A9886F4BBC3146' + ki: '00112233445566778899aabbccddeeff' auth_algo: 'xor' -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/17320 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I0198bc99f75e9567ee717aa79e434ec28705fac9 Gerrit-Change-Number: 17320 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin at sysmocom.de> Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200302/c692d6db/attachment.htm>