aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver Smith <osmith@sysmocom.de>2021-02-12 19:22:52 +0100
committerOliver Smith <osmith@sysmocom.de>2021-02-12 19:25:05 +0100
commit82251720b0c97da3728937e9beba49256a9fa312 (patch)
tree347cdbd03fc670576bd25c05d5a714499790d54b
parent19594be9e8f3c5dcfc5c66913886cd6c0eaf36bb (diff)
ttcn3-gbproxy-test: remove broken merge logs cmd
Remove commands that result in a docker error message, like in Ie6f8270230e1f0372b63d610b7868ea8719b18ad. Change-Id: I9dec8d27c0f09cd8ee75255c8dfa314c70387ee9
-rwxr-xr-xttcn3-gbproxy-test-fr/jenkins.sh12
-rwxr-xr-xttcn3-gbproxy-test/jenkins.sh11
2 files changed, 0 insertions, 23 deletions
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 @@ done
# 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 run --rm \
$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