fix issues with tcpdump truckroll
Change-Id: I6d2d973c9f6fa71baca0f0407564ee34370d6a2e
diff --git a/xos/synchronizer/files/run_tcpdump.sh b/xos/synchronizer/files/run_tcpdump.sh
index ed75bf0..02e92be 100644
--- a/xos/synchronizer/files/run_tcpdump.sh
+++ b/xos/synchronizer/files/run_tcpdump.sh
@@ -1,9 +1,5 @@
#! /bin/bash
INTERFACE=$1
-tcpdump -n -e -i $INTERFACE -c 100 &
-PID_TCPDUMP=$!
-curl http://www.xosproject.org/ &> /dev/null &
-PID_CURL=$!
-sleep 30s
-kill $PID_TCPDUMP
-kill $PIUD_CURL
+tcpdump -n -e -i $INTERFACE -c 10 &
+curl http://xosproject.org/ &> /dev/null &
+sleep 10s
diff --git a/xos/synchronizer/steps/sync_vtrtenant.yaml b/xos/synchronizer/steps/sync_vtrtenant.yaml
index 35d9032..880ed6c 100644
--- a/xos/synchronizer/steps/sync_vtrtenant.yaml
+++ b/xos/synchronizer/steps/sync_vtrtenant.yaml
@@ -57,7 +57,7 @@
shell: echo "{{ '{{' }} vm_traceroute_result.rc {{ '}}' }}" > /tmp/{{ resultcode_fn }}
when: (scope=="vm") and (test=="traceroute")
- - name: Run tcpdump for 30 seconds on VM
+ - name: Run tcpdump for 10 seconds on VM
shell: /root/run_tcpdump.sh {{ argument }} 2>&1 > /tmp/{{ result_fn }}
ignore_errors: yes
register: vm_tcpdump_result
@@ -99,10 +99,10 @@
command: docker cp /root/run_tcpdump.sh {{ container_name }}:/root/run_tcpdump.sh
when: (scope=="container") and (test=="tcpdump")
- - name: Run tcpdump for 30 seconds from Container
+ - name: Run tcpdump for 10 seconds from Container
shell: docker exec {{ container_name }} /root/run_tcpdump.sh {{ argument }} 2>&1 > /tmp/{{ result_fn }}
ignore_errors: yes
- register: diagresult
+ register: ctr_tcpdump_result
when: (scope=="container") and (test=="tcpdump")
- name: Store ctr tcpdump resultcode to file