<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/docker-playground/+/15872">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Introduce ttcn3-stp-test<br><br>Currently builds from osmo-ttcn3-hacks.git branch laforge/stp instead of<br>master, since it's only available in the former branch. Once it gets<br>merged, we can modify Dockerfile as explained in it.<br><br>OS#4220<br>Change-Id: I635c891f5da7b8c59527abbad14d7377465d1045<br>---<br>A ttcn3-stp-test/Dockerfile<br>A ttcn3-stp-test/Makefile<br>A ttcn3-stp-test/STP_Tests.cfg<br>A ttcn3-stp-test/jenkins.sh<br>A ttcn3-stp-test/osmo-stp.cfg<br>5 files changed, 164 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/72/15872/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/ttcn3-stp-test/Dockerfile b/ttcn3-stp-test/Dockerfile</span><br><span>new file mode 100644</span><br><span>index 0000000..7e671b3</span><br><span>--- /dev/null</span><br><span>+++ b/ttcn3-stp-test/Dockerfile</span><br><span>@@ -0,0 +1,40 @@</span><br><span style="color: hsl(120, 100%, 40%);">+ARG USER</span><br><span style="color: hsl(120, 100%, 40%);">+FROM $USER/debian-stretch-titan</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+RUN mkdir /root/projects && (cd /root/projects && ln -sf / git)</span><br><span style="color: hsl(120, 100%, 40%);">+RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# FIXME: Once M3UA dep update patches in laforge/stp is merged into master, the</span><br><span style="color: hsl(120, 100%, 40%);">+# line checking it out can be removed.</span><br><span style="color: hsl(120, 100%, 40%);">+RUN cd osmo-ttcn3-hacks && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git checkout -f -B master origin/master && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git fetch && git checkout -f -B laforge/stp origin/laforge/stp && \</span><br><span style="color: hsl(120, 100%, 40%);">+ make deps</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+RUN git config --global user.email docker@dock.er && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git config --global user.name "Dock Er"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# FIXME: Once STP patches in laforge/stp are merged into master, then</span><br><span style="color: hsl(120, 100%, 40%);">+# OSMO_TTCN3_BRANCH can be set again to "master".</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMO_TTCN3_BRANCH="laforge/stp"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit</span><br><span style="color: hsl(120, 100%, 40%);">+RUN cd osmo-ttcn3-hacks && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git fetch && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git checkout $OSMO_TTCN3_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \</span><br><span style="color: hsl(120, 100%, 40%);">+ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span style="color: hsl(120, 100%, 40%);">+ make stp</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+VOLUME /data</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+RUN ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \</span><br><span style="color: hsl(120, 100%, 40%);">+ ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh /</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+COPY STP_Tests.cfg /data/STP_Tests.cfg</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+CMD cd /data && \</span><br><span style="color: hsl(120, 100%, 40%);">+ /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/stp/STP_Tests; \</span><br><span style="color: hsl(120, 100%, 40%);">+ exit_code=$?; \</span><br><span style="color: hsl(120, 100%, 40%);">+ /osmo-ttcn3-hacks/log_merge.sh STP_Tests --rm; \</span><br><span style="color: hsl(120, 100%, 40%);">+ exit $exit_code</span><br><span>diff --git a/ttcn3-stp-test/Makefile b/ttcn3-stp-test/Makefile</span><br><span>new file mode 100644</span><br><span>index 0000000..cbcd544</span><br><span>--- /dev/null</span><br><span>+++ b/ttcn3-stp-test/Makefile</span><br><span>@@ -0,0 +1,3 @@</span><br><span style="color: hsl(120, 100%, 40%);">+RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran --ip 172.18.2.202 -v ggsn-test-vol:/data</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+include ../make/Makefile</span><br><span>diff --git a/ttcn3-stp-test/STP_Tests.cfg b/ttcn3-stp-test/STP_Tests.cfg</span><br><span>new file mode 100644</span><br><span>index 0000000..f41aded</span><br><span>--- /dev/null</span><br><span>+++ b/ttcn3-stp-test/STP_Tests.cfg</span><br><span>@@ -0,0 +1,20 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[ORDERED_INCLUDE]</span><br><span style="color: hsl(120, 100%, 40%);">+"/osmo-ttcn3-hacks/Common.cfg"</span><br><span style="color: hsl(120, 100%, 40%);">+"/osmo-ttcn3-hacks/stp/STP_Tests.default"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[LOGGING]</span><br><span style="color: hsl(120, 100%, 40%);">+*.JUnitLogger.testsuite_name := "STP_Tests"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[TESTPORT_PARAMETERS]</span><br><span style="color: hsl(120, 100%, 40%);">+*.VTY.CTRL_HOSTNAME := "172.18.19.200"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[MODULE_PARAMETERS]</span><br><span style="color: hsl(120, 100%, 40%);">+STP_Tests_Common.mp_stp_ip := "172.18.19.200";</span><br><span style="color: hsl(120, 100%, 40%);">+STP_Tests_Common.mp_local_ip := "172.18.19.203";</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[MAIN_CONTROLLER]</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[EXECUTE]</span><br><span style="color: hsl(120, 100%, 40%);">+STP_Tests.control</span><br><span>diff --git a/ttcn3-stp-test/jenkins.sh b/ttcn3-stp-test/jenkins.sh</span><br><span>new file mode 100755</span><br><span>index 0000000..7bb0337</span><br><span>--- /dev/null</span><br><span>+++ b/ttcn3-stp-test/jenkins.sh</span><br><span>@@ -0,0 +1,37 @@</span><br><span style="color: hsl(120, 100%, 40%);">+#!/bin/sh</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+. ../jenkins-common.sh</span><br><span style="color: hsl(120, 100%, 40%);">+IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"</span><br><span style="color: hsl(120, 100%, 40%);">+docker_images_require \</span><br><span style="color: hsl(120, 100%, 40%);">+ "debian-stretch-build" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "osmo-stp-$IMAGE_SUFFIX" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "debian-stretch-titan" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "ttcn3-stp-test"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+mkdir $VOL_BASE_DIR/stp-tester</span><br><span style="color: hsl(120, 100%, 40%);">+cp STP_Tests.cfg $VOL_BASE_DIR/stp-tester/</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+mkdir $VOL_BASE_DIR/stp</span><br><span style="color: hsl(120, 100%, 40%);">+cp osmo-stp.cfg $VOL_BASE_DIR/stp/</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+network_create 172.18.19.0/24</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+echo Starting container with STP</span><br><span style="color: hsl(120, 100%, 40%);">+docker run --rm \</span><br><span style="color: hsl(120, 100%, 40%);">+ --network $NET_NAME --ip 172.18.19.200 \</span><br><span style="color: hsl(120, 100%, 40%);">+ -v $VOL_BASE_DIR/stp:/data \</span><br><span style="color: hsl(120, 100%, 40%);">+ --name ${BUILD_TAG}-stp -d \</span><br><span style="color: hsl(120, 100%, 40%);">+ $REPO_USER/osmo-stp-$IMAGE_SUFFIX</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+echo Starting container with STP testsuite</span><br><span style="color: hsl(120, 100%, 40%);">+docker run --rm \</span><br><span style="color: hsl(120, 100%, 40%);">+ --network $NET_NAME --ip 172.18.19.203 \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e "TTCN3_PCAP_PATH=/data" \</span><br><span style="color: hsl(120, 100%, 40%);">+ -v $VOL_BASE_DIR/stp-tester:/data \</span><br><span style="color: hsl(120, 100%, 40%);">+ --name ${BUILD_TAG}-ttcn3-stp-test \</span><br><span style="color: hsl(120, 100%, 40%);">+ $REPO_USER/ttcn3-stp-test</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+docker container kill ${BUILD_TAG}-stp</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+network_remove</span><br><span style="color: hsl(120, 100%, 40%);">+collect_logs</span><br><span>diff --git a/ttcn3-stp-test/osmo-stp.cfg b/ttcn3-stp-test/osmo-stp.cfg</span><br><span>new file mode 100644</span><br><span>index 0000000..e16cd8b</span><br><span>--- /dev/null</span><br><span>+++ b/ttcn3-stp-test/osmo-stp.cfg</span><br><span>@@ -0,0 +1,64 @@</span><br><span style="color: hsl(120, 100%, 40%);">+!</span><br><span style="color: hsl(120, 100%, 40%);">+! OsmoSTP (1.1.0.2-3884) configuration saved from vty</span><br><span style="color: hsl(120, 100%, 40%);">+!!</span><br><span style="color: hsl(120, 100%, 40%);">+!</span><br><span style="color: hsl(120, 100%, 40%);">+log stderr</span><br><span style="color: hsl(120, 100%, 40%);">+ logging filter all 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging color 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print category-hex 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print category 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging timestamp 0</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print file 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level lglobal notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level llapd notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level linp notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level lmux notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level lmi notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level lmib notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level lsms notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level lctrl notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level lgtp notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level lstats notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level lgsup notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level loap notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level lss7 debug</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level lsccp debug</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level lsua debug</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level lm3ua debug</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level lmgcp notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level ljibuf notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level lrspro notice</span><br><span style="color: hsl(120, 100%, 40%);">+!</span><br><span style="color: hsl(120, 100%, 40%);">+stats interval 5</span><br><span style="color: hsl(120, 100%, 40%);">+!</span><br><span style="color: hsl(120, 100%, 40%);">+line vty</span><br><span style="color: hsl(120, 100%, 40%);">+ no login</span><br><span style="color: hsl(120, 100%, 40%);">+ bind 0.0.0.0</span><br><span style="color: hsl(120, 100%, 40%);">+!</span><br><span style="color: hsl(120, 100%, 40%);">+cs7 instance 0</span><br><span style="color: hsl(120, 100%, 40%);">+ point-code format 24</span><br><span style="color: hsl(120, 100%, 40%);">+ asp asp-sender 9999 2905 m3ua</span><br><span style="color: hsl(120, 100%, 40%);">+ local-ip 172.18.19.200</span><br><span style="color: hsl(120, 100%, 40%);">+ remote-ip 172.18.19.203</span><br><span style="color: hsl(120, 100%, 40%);">+ asp asp-receiver0 10000 2905 m3ua</span><br><span style="color: hsl(120, 100%, 40%);">+ local-ip 172.18.19.200</span><br><span style="color: hsl(120, 100%, 40%);">+ remote-ip 172.18.19.203</span><br><span style="color: hsl(120, 100%, 40%);">+ asp asp-receiver1 10001 2905 m3ua</span><br><span style="color: hsl(120, 100%, 40%);">+ local-ip 172.18.19.200</span><br><span style="color: hsl(120, 100%, 40%);">+ remote-ip 172.18.19.203</span><br><span style="color: hsl(120, 100%, 40%);">+ as as-sender m3ua</span><br><span style="color: hsl(120, 100%, 40%);">+ asp asp-sender</span><br><span style="color: hsl(120, 100%, 40%);">+ routing-key 1023 23</span><br><span style="color: hsl(120, 100%, 40%);">+ as as-receiver m3ua</span><br><span style="color: hsl(120, 100%, 40%);">+ asp asp-receiver0</span><br><span style="color: hsl(120, 100%, 40%);">+ routing-key 1042 42</span><br><span style="color: hsl(120, 100%, 40%);">+ as mahlzeit ipa</span><br><span style="color: hsl(120, 100%, 40%);">+ routing-key 0 5</span><br><span style="color: hsl(120, 100%, 40%);">+ point-code override dpc 23</span><br><span style="color: hsl(120, 100%, 40%);">+ route-table system</span><br><span style="color: hsl(120, 100%, 40%);">+ update route 23 16777215 linkset as-sender</span><br><span style="color: hsl(120, 100%, 40%);">+ update route 42 16777215 linkset as-receiver</span><br><span style="color: hsl(120, 100%, 40%);">+ listen m3ua 2905</span><br><span style="color: hsl(120, 100%, 40%);">+ accept-asp-connections dynamic-permitted</span><br><span style="color: hsl(120, 100%, 40%);">+ listen ipa 5000</span><br><span style="color: hsl(120, 100%, 40%);">+ accept-asp-connections dynamic-permitted</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/docker-playground/+/15872">change 15872</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/docker-playground/+/15872"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: docker-playground </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I635c891f5da7b8c59527abbad14d7377465d1045 </div>
<div style="display:none"> Gerrit-Change-Number: 15872 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>