<p>laforge <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/docker-playground/+/15511">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved; Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">support for dockerized osmo-resmim testsuite<br><br>Change-Id: I05090f408b04aae24c23978da831e9f844d723a3<br>---<br>A ttcn3-remsim-test/.release<br>A ttcn3-remsim-test/Dockerfile<br>A ttcn3-remsim-test/Makefile<br>A ttcn3-remsim-test/REMSIM_Tests.cfg<br>A ttcn3-remsim-test/bankd/REMSIM_Tests.cfg<br>A ttcn3-remsim-test/bankd/bankd_pcsc_slots.csv<br>A ttcn3-remsim-test/client/REMSIM_Tests.cfg<br>A ttcn3-remsim-test/jenkins.sh<br>8 files changed, 182 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/ttcn3-remsim-test/.release b/ttcn3-remsim-test/.release</span><br><span>new file mode 100644</span><br><span>index 0000000..a036e4f</span><br><span>--- /dev/null</span><br><span>+++ b/ttcn3-remsim-test/.release</span><br><span>@@ -0,0 +1,2 @@</span><br><span style="color: hsl(120, 100%, 40%);">+release=0.0.0</span><br><span style="color: hsl(120, 100%, 40%);">+tag=ttcn3-remsim-test-0.0.0</span><br><span>diff --git a/ttcn3-remsim-test/Dockerfile b/ttcn3-remsim-test/Dockerfile</span><br><span>new file mode 100644</span><br><span>index 0000000..b1ea71f</span><br><span>--- /dev/null</span><br><span>+++ b/ttcn3-remsim-test/Dockerfile</span><br><span>@@ -0,0 +1,35 @@</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%);">+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%);">+ 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%);">+ARG OSMO_TTCN3_BRANCH="master"</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 deps-update remsim</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 REMSIM_Tests.cfg /data/REMSIM_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/remsim/REMSIM_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 REMSIM_Tests --rm; \</span><br><span style="color: hsl(120, 100%, 40%);">+ exit $exit_code</span><br><span>diff --git a/ttcn3-remsim-test/Makefile b/ttcn3-remsim-test/Makefile</span><br><span>new file mode 100644</span><br><span>index 0000000..0895788</span><br><span>--- /dev/null</span><br><span>+++ b/ttcn3-remsim-test/Makefile</span><br><span>@@ -0,0 +1,2 @@</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-remsim-test/REMSIM_Tests.cfg b/ttcn3-remsim-test/REMSIM_Tests.cfg</span><br><span>new file mode 100644</span><br><span>index 0000000..5a9f026</span><br><span>--- /dev/null</span><br><span>+++ b/ttcn3-remsim-test/REMSIM_Tests.cfg</span><br><span>@@ -0,0 +1,16 @@</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/remsim/REMSIM_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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[TESTPORT_PARAMETERS]</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%);">+# IP address of IUT (server) to which test connects</span><br><span style="color: hsl(120, 100%, 40%);">+REMSIM_Tests.mp_server_ip := "172.18.17.20"</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%);">+RemsimServer_Tests.control</span><br><span>diff --git a/ttcn3-remsim-test/bankd/REMSIM_Tests.cfg b/ttcn3-remsim-test/bankd/REMSIM_Tests.cfg</span><br><span>new file mode 100644</span><br><span>index 0000000..2e77590</span><br><span>--- /dev/null</span><br><span>+++ b/ttcn3-remsim-test/bankd/REMSIM_Tests.cfg</span><br><span>@@ -0,0 +1,18 @@</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/remsim/REMSIM_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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[TESTPORT_PARAMETERS]</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%);">+# IP address on which the simulated server binds</span><br><span style="color: hsl(120, 100%, 40%);">+REMSIM_Tests.mp_server_ip := "172.18.17.10"</span><br><span style="color: hsl(120, 100%, 40%);">+# IP address of the IUT (bankd) to which simulated client connects</span><br><span style="color: hsl(120, 100%, 40%);">+REMSIM_Tests.mp_bankd_ip := "172.18.17.30"</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%);">+RemsimBankd_Tests.control</span><br><span>diff --git a/ttcn3-remsim-test/bankd/bankd_pcsc_slots.csv b/ttcn3-remsim-test/bankd/bankd_pcsc_slots.csv</span><br><span>new file mode 100644</span><br><span>index 0000000..38a22c9</span><br><span>--- /dev/null</span><br><span>+++ b/ttcn3-remsim-test/bankd/bankd_pcsc_slots.csv</span><br><span>@@ -0,0 +1,6 @@</span><br><span style="color: hsl(120, 100%, 40%);">+"1","0","ACS ACR33 ICC Reader 00 00"</span><br><span style="color: hsl(120, 100%, 40%);">+"1","1","ACS ACR33 ICC Reader 00 01"</span><br><span style="color: hsl(120, 100%, 40%);">+"1","2","ACS ACR33 ICC Reader 00 02"</span><br><span style="color: hsl(120, 100%, 40%);">+"1","3","ACS ACR33 ICC Reader 00 03"</span><br><span style="color: hsl(120, 100%, 40%);">+"1","4","ACS ACR33 ICC Reader 00 04"</span><br><span style="color: hsl(120, 100%, 40%);">+"1","23","Alcor Micro AU9560 00 00"</span><br><span>diff --git a/ttcn3-remsim-test/client/REMSIM_Tests.cfg b/ttcn3-remsim-test/client/REMSIM_Tests.cfg</span><br><span>new file mode 100644</span><br><span>index 0000000..d3f8d42</span><br><span>--- /dev/null</span><br><span>+++ b/ttcn3-remsim-test/client/REMSIM_Tests.cfg</span><br><span>@@ -0,0 +1,18 @@</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/remsim/REMSIM_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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[TESTPORT_PARAMETERS]</span><br><span style="color: hsl(120, 100%, 40%);">+# IP address to which ATS binds emulated remsim-server</span><br><span style="color: hsl(120, 100%, 40%);">+REMSIM_Tests.mp_server_ip := "172.18.17.10"</span><br><span style="color: hsl(120, 100%, 40%);">+# IP address to which ATS binds emulated remsim-bankd</span><br><span style="color: hsl(120, 100%, 40%);">+REMSIM_Tests.mp_bankd_ip := "172.18.17.10"</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%);">+</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%);">+RemsimClient_Tests.control</span><br><span>diff --git a/ttcn3-remsim-test/jenkins.sh b/ttcn3-remsim-test/jenkins.sh</span><br><span>new file mode 100755</span><br><span>index 0000000..38da9b3</span><br><span>--- /dev/null</span><br><span>+++ b/ttcn3-remsim-test/jenkins.sh</span><br><span>@@ -0,0 +1,85 @@</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-remsim-$IMAGE_SUFFIX" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "ttcn3-remsim-test"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+start_server() {</span><br><span style="color: hsl(120, 100%, 40%);">+ echo Starting container with osmo-remsim-server</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.17.20 \</span><br><span style="color: hsl(120, 100%, 40%);">+ -v $VOL_BASE_DIR/server:/data \</span><br><span style="color: hsl(120, 100%, 40%);">+ --name ${BUILD_TAG}-server -d \</span><br><span style="color: hsl(120, 100%, 40%);">+ $REPO_USER/osmo-remsim-$IMAGE_SUFFIX \</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo-remsim-server</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%);">+start_bankd() {</span><br><span style="color: hsl(120, 100%, 40%);">+ echo Starting container with osmo-remsim-bankd</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.17.30 \</span><br><span style="color: hsl(120, 100%, 40%);">+ -v $VOL_BASE_DIR/bankd:/data \</span><br><span style="color: hsl(120, 100%, 40%);">+ --name ${BUILD_TAG}-bankd -d \</span><br><span style="color: hsl(120, 100%, 40%);">+ $REPO_USER/osmo-remsim-$IMAGE_SUFFIX \</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo-remsim-bankd -i 172.18.17.10</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%);">+start_client() {</span><br><span style="color: hsl(120, 100%, 40%);">+ echo Starting container with osmo-remsim-client</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.17.40 \</span><br><span style="color: hsl(120, 100%, 40%);">+ -v $VOL_BASE_DIR/client:/data \</span><br><span style="color: hsl(120, 100%, 40%);">+ --name ${BUILD_TAG}-client-d \</span><br><span style="color: hsl(120, 100%, 40%);">+ $REPO_USER/osmo-remsim-$IMAGE_SUFFIX \</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo-remsim-client</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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+start_testsuite() {</span><br><span style="color: hsl(120, 100%, 40%);">+ echo Starting container with REMSIM 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.17.10 \</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/remsim-tester:/data \</span><br><span style="color: hsl(120, 100%, 40%);">+ --name ${BUILD_TAG}-ttcn3-remsim-test \</span><br><span style="color: hsl(120, 100%, 40%);">+ $REPO_USER/ttcn3-remsim-test</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%);">+network_create 172.18.17.0/24</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+mkdir $VOL_BASE_DIR/remsim-tester</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+mkdir $VOL_BASE_DIR/server</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+mkdir $VOL_BASE_DIR/bankd</span><br><span style="color: hsl(120, 100%, 40%);">+cp bankd/bankd_pcsc_slots.csv $VOL_BASE_DIR/bankd/</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+mkdir $VOL_BASE_DIR/client</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%);">+# 1) server test suite</span><br><span style="color: hsl(120, 100%, 40%);">+start_server</span><br><span style="color: hsl(120, 100%, 40%);">+cp REMSIM_Tests.cfg $VOL_BASE_DIR/remsim-tester/</span><br><span style="color: hsl(120, 100%, 40%);">+start_testsuite</span><br><span style="color: hsl(120, 100%, 40%);">+docker container kill ${BUILD_TAG}-server</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# 2) bankd test suite</span><br><span style="color: hsl(120, 100%, 40%);">+echo "Changing to bankd configuration"</span><br><span style="color: hsl(120, 100%, 40%);">+start_bankd</span><br><span style="color: hsl(120, 100%, 40%);">+cp bankd/REMSIM_Tests.cfg $VOL_BASE_DIR/remsim-tester/</span><br><span style="color: hsl(120, 100%, 40%);">+start_testsuite</span><br><span style="color: hsl(120, 100%, 40%);">+docker container kill ${BUILD_TAG}-bankd</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# 3) client test suite</span><br><span style="color: hsl(120, 100%, 40%);">+#echo "Changing to client configuration"</span><br><span style="color: hsl(120, 100%, 40%);">+#start_client</span><br><span style="color: hsl(120, 100%, 40%);">+#cp client/REMSIM_Tests.cfg $VOL_BASE_DIR/remsim-tester/</span><br><span style="color: hsl(120, 100%, 40%);">+#start_testsuite</span><br><span style="color: hsl(120, 100%, 40%);">+#docker container kill ${BUILD_TAG}-client</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></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/docker-playground/+/15511">change 15511</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/+/15511"/><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: I05090f408b04aae24c23978da831e9f844d723a3 </div>
<div style="display:none"> Gerrit-Change-Number: 15511 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>