Merge "Add monitor web page to Health Check test"

diff --git a/test/auto-test/FTC10.sh b/test/auto-test/FTC10.sh
index eaa6de2..45e7bdd 100755 (executable)
--- a/test/auto-test/FTC10.sh
+++ b/test/auto-test/FTC10.sh
@@ -153,8 +153,8 @@ sim_equal ricsim_g2_1 num_instances 0
 
 # Check remote host access to simulator
 
-sim_contains_ste ricsim_g1_1 hosts "policy-agent"
-sim_contains_ste ricsim_g2_1 hosts "policy-agent"
+sim_contains_str ricsim_g1_1 remote_hosts "policy-agent"
+sim_contains_str ricsim_g2_1 remote_hosts "policy-agent"
 
 # Check policy removal
 use_agent_rest_http

diff --git a/test/jenkins/.gitignore b/test/jenkins/.gitignore
index e8cbd0e..260a2eb 100644 (file)
--- 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 (executable)
--- a/test/jenkins/run_test.sh
+++ b/test/jenkins/run_test.sh
@@ -26,8 +26,13 @@ curl -L "https://github.com/docker/compose/releases/download/1.26.0/docker-compo
 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 @@ echo "--> run_integration.sh END"
 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

diff --git a/test/mrstub/Dockerfile b/test/mrstub/Dockerfile
index 07101ad..513894c 100644 (file)
--- a/test/mrstub/Dockerfile
+++ b/test/mrstub/Dockerfile
@@ -28,9 +28,6 @@ RUN chmod +x start.sh
 RUN apt-get update
 RUN apt-get install -y nginx=1.14.*
 
-#install curl
-RUN apt-get install -y curl
-
 #start mrstub
 RUN pip install -r requirements.txt