Fix a small issue & update gitignore
Issue-ID: NONRTRIC-237
Signed-off-by: ecaiyanlinux <martin.c.yan@est.tech>
Change-Id: Ib935146cdd338b860675f7519c12d194fdb0305d
diff --git a/test/jenkins/.gitignore b/test/jenkins/.gitignore
index e8cbd0e..260a2eb 100644
--- a/test/jenkins/.gitignore
+++ b/test/jenkins/.gitignore
@@ -1,9 +1,9 @@
.consul_config.json
.docker-images-table
-.httplog_FTC10.txt
+.httplog*
.image-list
.output.consul_config.json
-.resultFTC10.txt
+.result*
.timer_measurement.txt
.tmp.curl.json
logs/
diff --git a/test/jenkins/run_test.sh b/test/jenkins/run_test.sh
index 469288d..e7262e4 100755
--- a/test/jenkins/run_test.sh
+++ b/test/jenkins/run_test.sh
@@ -26,8 +26,13 @@
chmod +x docker-compose
export PATH=$PATH:`pwd`
+clean_docker(){
+ docker stop $(docker ps -aq)
+ docker system prune -f
+}
# Run auto-test scripts
cd ../auto-test/
+clean_docker
bash FTC10.sh remote auto-clean --use-local-image PA SDNC
echo "--> run_integration.sh END"
@@ -35,8 +40,8 @@
FILE=.resultFTC10.txt
if [[ -f "$FILE" ]]; then
res=$(cat .resultFTC10.txt)
- docker system prune -f
+ clean_docker
exit $res
fi
-docker system prune -f
+clean_docker
exit 1