<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/docker-playground/+/22883">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ttcn3-gbproxy-test: remove broken merge logs cmd<br><br>Remove commands that result in a docker error message, like in<br>Ie6f8270230e1f0372b63d610b7868ea8719b18ad.<br><br>Change-Id: I9dec8d27c0f09cd8ee75255c8dfa314c70387ee9<br>---<br>M ttcn3-gbproxy-test-fr/jenkins.sh<br>M ttcn3-gbproxy-test/jenkins.sh<br>2 files changed, 0 insertions(+), 23 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/83/22883/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/ttcn3-gbproxy-test-fr/jenkins.sh b/ttcn3-gbproxy-test-fr/jenkins.sh</span><br><span>index 863e8ef..4ef2ace 100755</span><br><span>--- a/ttcn3-gbproxy-test-fr/jenkins.sh</span><br><span>+++ b/ttcn3-gbproxy-test-fr/jenkins.sh</span><br><span>@@ -78,18 +78,6 @@</span><br><span> # must shift the net-devices into the container _after_ it is started</span><br><span> docker logs       -f ${BUILD_TAG}-ttcn3-gbproxy-test</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-echo Starting container to merge logs</span><br><span style="color: hsl(0, 100%, 40%);">-docker run   --rm \</span><br><span style="color: hsl(0, 100%, 40%);">-          $(docker_network_params $SUBNET 103) \</span><br><span style="color: hsl(0, 100%, 40%);">-          --ulimit core=-1 \</span><br><span style="color: hsl(0, 100%, 40%);">-              -e "TTCN3_PCAP_PATH=/data" \</span><br><span style="color: hsl(0, 100%, 40%);">-          -v $VOL_BASE_DIR/gbproxy-tester:/data \</span><br><span style="color: hsl(0, 100%, 40%);">-         --name ${BUILD_TAG}-ttcn3-gbproxy-test-logmerge \</span><br><span style="color: hsl(0, 100%, 40%);">-               --entrypoint /osmo-ttcn3-hacks/log_merge.sh GBProxy_Tests --rm \</span><br><span style="color: hsl(0, 100%, 40%);">-                $DOCKER_ARGS \</span><br><span style="color: hsl(0, 100%, 40%);">-          $REPO_USER/ttcn3-gbproxy-test</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> echo Stopping containers</span><br><span> docker container kill ${BUILD_TAG}-gbproxy</span><br><span> </span><br><span>diff --git a/ttcn3-gbproxy-test/jenkins.sh b/ttcn3-gbproxy-test/jenkins.sh</span><br><span>index 9605608..b063c7f 100755</span><br><span>--- a/ttcn3-gbproxy-test/jenkins.sh</span><br><span>+++ b/ttcn3-gbproxy-test/jenkins.sh</span><br><span>@@ -45,17 +45,6 @@</span><br><span>            $DOCKER_ARGS \</span><br><span>               $REPO_USER/ttcn3-gbproxy-test $@</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-echo Starting container to merge logs</span><br><span style="color: hsl(0, 100%, 40%);">-docker run     --rm \</span><br><span style="color: hsl(0, 100%, 40%);">-          $(docker_network_params $SUBNET 103) \</span><br><span style="color: hsl(0, 100%, 40%);">-          --ulimit core=-1 \</span><br><span style="color: hsl(0, 100%, 40%);">-              -e "TTCN3_PCAP_PATH=/data" \</span><br><span style="color: hsl(0, 100%, 40%);">-          -v $VOL_BASE_DIR/gbproxy-tester:/data \</span><br><span style="color: hsl(0, 100%, 40%);">-         --name ${BUILD_TAG}-ttcn3-gbproxy-test-logmerge \</span><br><span style="color: hsl(0, 100%, 40%);">-               --entrypoint /osmo-ttcn3-hacks/log_merge.sh GBProxy_Tests --rm \</span><br><span style="color: hsl(0, 100%, 40%);">-                $DOCKER_ARGS \</span><br><span style="color: hsl(0, 100%, 40%);">-          $REPO_USER/ttcn3-gbproxy-test</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> echo Stopping containers</span><br><span> docker container kill ${BUILD_TAG}-gbproxy</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/docker-playground/+/22883">change 22883</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/+/22883"/><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: I9dec8d27c0f09cd8ee75255c8dfa314c70387ee9 </div>
<div style="display:none"> Gerrit-Change-Number: 22883 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>