From 459a620a60f0cee9841300ee2bcda2b14ed1f2a7 Mon Sep 17 00:00:00 2001 From: yanhuanwang Date: Fri, 13 Sep 2019 14:19:05 +0200 Subject: [PATCH] Fix bug of DFC daily jenkins job Change-Id: I59277bc4b259d1b91b3259e7985efca6b0639671 Signed-off-by: yanhuanwang Issue-ID: DCAEGEN2-1702 --- .../Functional-suite/teardown.sh | 2 ++ .../dfc-management/dfc-start.sh | 9 ++++++ .../FuncSingleFile.robot | 36 +++++++++++----------- 3 files changed, 29 insertions(+), 18 deletions(-) diff --git a/plans/dcaegen2-collectors-datafile/Functional-suite/teardown.sh b/plans/dcaegen2-collectors-datafile/Functional-suite/teardown.sh index 2c46439e..eaebbc24 100644 --- a/plans/dcaegen2-collectors-datafile/Functional-suite/teardown.sh +++ b/plans/dcaegen2-collectors-datafile/Functional-suite/teardown.sh @@ -2,6 +2,8 @@ running_containers=$(docker ps --filter name=dfc_ -qa) running_images=$(docker images -q) +docker exec -it dfc_app0 cat /var/log/ONAP/application.log >> $WORKSPACE/archives/dfc_app0_application.log +docker logs dfc_mr-sim >> $WORKSPACE/archives/dfc_mr-sim.log if [ -z "$running_containers" ] then diff --git a/scripts/dcaegen2-collectors-datafile/dfc-management/dfc-start.sh b/scripts/dcaegen2-collectors-datafile/dfc-management/dfc-start.sh index c63eaf68..808b0b17 100755 --- a/scripts/dcaegen2-collectors-datafile/dfc-management/dfc-start.sh +++ b/scripts/dcaegen2-collectors-datafile/dfc-management/dfc-start.sh @@ -17,6 +17,15 @@ for i in {1..10}; do if [ $(docker inspect --format '{{ .State.Running }}' $DFC_APP) ] then echo "DFC app Running" + # enable TRACE logging of DFC + docker exec $DFC_APP /bin/sh -c " sed -i 's/org.onap.dcaegen2.collectors.datafile: WARN/org.onap.dcaegen2.collectors.datafile: TRACE/g' /opt/app/datafile/config/application.yaml" + + #enable TRACE logging of spring-framework + docker exec $DFC_APP /bin/sh -c " sed -i 's/org.springframework.data: ERROR/org.springframework.data: TRACE/g' /opt/app/datafile/config/application.yaml" + + docker restart $DFC_APP + sleep 10 + break else echo sleep $i diff --git a/tests/dcaegen2-collectors-datafile/testsuites/Functional-Single-File-suite/FuncSingleFile.robot b/tests/dcaegen2-collectors-datafile/testsuites/Functional-Single-File-suite/FuncSingleFile.robot index af7b6f1a..595b37f0 100755 --- a/tests/dcaegen2-collectors-datafile/testsuites/Functional-Single-File-suite/FuncSingleFile.robot +++ b/tests/dcaegen2-collectors-datafile/testsuites/Functional-Single-File-suite/FuncSingleFile.robot @@ -65,10 +65,10 @@ Verify single event with single 1MB SFTP file. From event poll to published file Wait Until Keyword Succeeds 1 minute 10 sec DR Sim Published Files Equal 1 #Verify 1 file published to DR sim DR Redir Sim Downloaded Volume Equal 1 000 000 #Verify 1 000 000 bytes published file data in DR redir sim - ${cli_cmd_output}= Run Process ${SIMGROUP_ROOT}/simulators-kill.sh - Log ${cli_cmd_output.stdout} ${cli_cmd_output.stderr} - ${cli_cmd_output}= Run Process ${DFC_ROOT}/dfc-kill.sh - Log ${cli_cmd_output.stdout} ${cli_cmd_output.stderr} + #${cli_cmd_output}= Run Process ${SIMGROUP_ROOT}/simulators-kill.sh + #Log ${cli_cmd_output.stdout} ${cli_cmd_output.stderr} + #${cli_cmd_output}= Run Process ${DFC_ROOT}/dfc-kill.sh + #Log ${cli_cmd_output.stdout} ${cli_cmd_output.stderr} Verify single event with single 5MB SFTP file. From event poll to published file [TAGS] DFC_FUNCTIONAL_2 @@ -120,16 +120,16 @@ Verify single event with single 5MB SFTP file. From event poll to published file Wait Until Keyword Succeeds 1 minute 10 sec DR Sim Published Files Equal 1 #Verify 1 file published to DR sim DR Redir Sim Downloaded Volume Equal 5 000 000 #Verify 5 000 000 bytes published file data in DR redir sim - ${cli_cmd_output}= Run Process ${SIMGROUP_ROOT}/simulators-kill.sh - Log ${cli_cmd_output.stdout} ${cli_cmd_output.stderr} - ${cli_cmd_output}= Run Process ${DFC_ROOT}/dfc-kill.sh - Log ${cli_cmd_output.stdout} ${cli_cmd_output.stderr} - - ${cli_cmd_output}= Run Process docker stop $(docker ps -aq) shell=yes - Log ${cli_cmd_output.stdout} ${cli_cmd_output.stderr} - - ${cli_cmd_output}= Run Process docker rm $(docker ps -aq) shell=yes - Log ${cli_cmd_output.stdout} ${cli_cmd_output.stderr} + #${cli_cmd_output}= Run Process ${SIMGROUP_ROOT}/simulators-kill.sh + #Log ${cli_cmd_output.stdout} ${cli_cmd_output.stderr} + #${cli_cmd_output}= Run Process ${DFC_ROOT}/dfc-kill.sh + #Log ${cli_cmd_output.stdout} ${cli_cmd_output.stderr} +# + #${cli_cmd_output}= Run Process docker stop $(docker ps -aq) shell=yes + #Log ${cli_cmd_output.stdout} ${cli_cmd_output.stderr} +# + #${cli_cmd_output}= Run Process docker rm $(docker ps -aq) shell=yes + #Log ${cli_cmd_output.stdout} ${cli_cmd_output.stderr} Sleep 10 @@ -182,10 +182,10 @@ Verify single event with single 50MB SFTP file. From event poll to published fil Wait Until Keyword Succeeds 1 minute 10 sec DR Sim Published Files Equal 1 #Verify 1 file published to DR sim DR Redir Sim Downloaded Volume Equal 50 000 000 #Verify 50 000 000 bytes published file data in DR redir sim - ${cli_cmd_output}= Run Process ${SIMGROUP_ROOT}/simulators-kill.sh - Log ${cli_cmd_output.stdout} ${cli_cmd_output.stderr} - ${cli_cmd_output}= Run Process ${DFC_ROOT}/dfc-kill.sh - Log ${cli_cmd_output.stdout} ${cli_cmd_output.stderr} + #${cli_cmd_output}= Run Process ${SIMGROUP_ROOT}/simulators-kill.sh + #Log ${cli_cmd_output.stdout} ${cli_cmd_output.stderr} + #${cli_cmd_output}= Run Process ${DFC_ROOT}/dfc-kill.sh + #Log ${cli_cmd_output.stdout} ${cli_cmd_output.stderr} ######### Single file, FTPS # Temporarily removed due to issues with the certificates for the ftsp server simulator cert. -- 2.16.6