Change in docker-playground[master]: ttcn3-gbproxy-test: remove broken merge logs cmd

[laforge]

laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22883 )

Change subject: ttcn3-gbproxy-test: remove broken merge logs cmd
......................................................................

ttcn3-gbproxy-test: remove broken merge logs cmd

Remove commands that result in a docker error message, like in
Ie6f8270230e1f0372b63d610b7868ea8719b18ad.

Change-Id: I9dec8d27c0f09cd8ee75255c8dfa314c70387ee9
---
M ttcn3-gbproxy-test-fr/jenkins.sh
M ttcn3-gbproxy-test/jenkins.sh
2 files changed, 0 insertions(+), 23 deletions(-)

Approvals:
  laforge: Looks good to me, approved; Verified



diff --git a/ttcn3-gbproxy-test-fr/jenkins.sh b/ttcn3-gbproxy-test-fr/jenkins.sh
index 863e8ef..4ef2ace 100755
--- a/ttcn3-gbproxy-test-fr/jenkins.sh
+++ b/ttcn3-gbproxy-test-fr/jenkins.sh
@@ -78,18 +78,6 @@
 # must shift the net-devices into the container _after_ it is started
 docker logs	-f ${BUILD_TAG}-ttcn3-gbproxy-test
 
-
-echo Starting container to merge logs
-docker run	--rm \
-		$(docker_network_params $SUBNET 103) \
-		--ulimit core=-1 \
-		-e "TTCN3_PCAP_PATH=/data" \
-		-v $VOL_BASE_DIR/gbproxy-tester:/data \
-		--name ${BUILD_TAG}-ttcn3-gbproxy-test-logmerge \
-		--entrypoint /osmo-ttcn3-hacks/log_merge.sh GBProxy_Tests --rm \
-		$DOCKER_ARGS \
-		$REPO_USER/ttcn3-gbproxy-test
-
 echo Stopping containers
 docker container kill ${BUILD_TAG}-gbproxy
 
diff --git a/ttcn3-gbproxy-test/jenkins.sh b/ttcn3-gbproxy-test/jenkins.sh
index 9605608..b063c7f 100755
--- a/ttcn3-gbproxy-test/jenkins.sh
+++ b/ttcn3-gbproxy-test/jenkins.sh
@@ -45,17 +45,6 @@
 		$DOCKER_ARGS \
 		$REPO_USER/ttcn3-gbproxy-test $@
 
-echo Starting container to merge logs
-docker run	--rm \
-		$(docker_network_params $SUBNET 103) \
-		--ulimit core=-1 \
-		-e "TTCN3_PCAP_PATH=/data" \
-		-v $VOL_BASE_DIR/gbproxy-tester:/data \
-		--name ${BUILD_TAG}-ttcn3-gbproxy-test-logmerge \
-		--entrypoint /osmo-ttcn3-hacks/log_merge.sh GBProxy_Tests --rm \
-		$DOCKER_ARGS \
-		$REPO_USER/ttcn3-gbproxy-test
-
 echo Stopping containers
 docker container kill ${BUILD_TAG}-gbproxy
 

-- 
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22883
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I9dec8d27c0f09cd8ee75255c8dfa314c70387ee9
Gerrit-Change-Number: 22883
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith at sysmocom.de>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210216/5168c5b2/attachment.htm>