Merge "support docker build image during updating testapi"

3 files changed, 19 insertions, 1 deletions

diff --git a/utils/test/result_collection_api/update/README.md b/utils/test/result_collection_api/update/README.md
index d3aef7efe..738f30ab7 100644
--- a/utils/test/result_collection_api/update/README.md
+++ b/utils/test/result_collection_api/update/README.md
@@ -96,6 +96,7 @@ host=10.63.243.17
 user=zte
 port=8000
 image=opnfv/testapi
+mode=build
 update_path=/tmp/testapi
 mongodb_url=mongodb://172.17.0.1:27017
 swagger_url=http://10.63.243.17:8000"```
diff --git a/utils/test/result_collection_api/update/templates/rm_images.sh b/utils/test/result_collection_api/update/templates/rm_images.sh
new file mode 100755
index 000000000..6722573b4
--- /dev/null
+++ b/utils/test/result_collection_api/update/templates/rm_images.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+number=`docker images | awk 'NR != 1' | grep testapi | wc -l`
+if [ $number -gt 0 ]; then
+    images=`docker images -a | awk 'NR != 1' | grep testapi | awk '{print $1}'`
+    echo "begin to rm images $images"
+    docker images | awk 'NR != 1' | grep testapi | awk '{print $3}' | xargs docker rmi -f &>/dev/null
+fi
diff --git a/utils/test/result_collection_api/update/update.yml b/utils/test/result_collection_api/update/update.yml
index 08839564a..e6663d905 100644
--- a/utils/test/result_collection_api/update/update.yml
+++ b/utils/test/result_collection_api/update/update.yml
@@ -8,6 +8,7 @@
     port: "8000"
     update_path: "/tmp/testapi"
     image: "opnfv/testapi"
+    mode: "pull"
     mongodb_url: "mongodb://172.17.0.1:27017"
     swagger_url: "http://{{ host }}:{{ port }}"
   tasks:
@@ -19,6 +20,11 @@
       copy:
         src: templates/
         dest: "{{ update_path }}"
+    - name: transfer Dockerfile
+      copy:
+        src: ../docker/Dockerfile
+        dest: "{{ update_path }}"
+      when: mode == "build"
     - name: backup mongodb database
       command: "python {{ update_path }}/backup_mongodb.py -u {{ mongodb_url }} -o {{ update_path }}"
     - name: stop and remove old versions
@@ -26,10 +32,13 @@
       register: rm_result
     - debug: msg="{{ rm_result.stderr }}"
     - name: delete old docker images
-      command: docker rmi "{{ image }}"
+      command: bash "{{ update_path }}/rm_images.sh"
       ignore_errors: true
     - name: update mongodb
       command: "python {{ update_path }}/update_mongodb.py -u {{ mongodb_url }}"
+    - name: docker build image
+      command: "docker build -t {{ image }} {{ update_path }}"
+      when: mode == "build"
     - name: docker start testapi server
       command: docker run -dti -p "{{ port }}:8000"
                -e "mongodb_url={{ mongodb_url }}"