summaryrefslogtreecommitdiffstats
path: root/jjb/releng/automate.yml
diff options
context:
space:
mode:
authorSerenaFeng <feng.xiaowei@zte.com.cn>2017-08-11 18:39:12 +0800
committerSerenaFeng <feng.xiaowei@zte.com.cn>2017-08-17 15:04:36 +0800
commit36a6fe993a5b86828cf4d883112d79f62561a8bf (patch)
tree7e3c1e5b8e2e21d81134f9406b486680102f3c4c /jjb/releng/automate.yml
parent8fcf54dee04407c6f04ecf47e703dba13a3e1151 (diff)
prepare for testresults.opnfv.org's watchdog
Due to the frequent crash in testresults.opnfv.org, watchdog will be introduced to monitor the status of docker daemon/testapi container/reporting container, to make timely recovery, to make things clear, some refactors included in this patch: 1) leverage container name and image name rather than id 2) address three conditions during the update 3) refactor code to be more readable Change-Id: Ifa7a6fd94db62d532026b5fad33835b0e2abd9af Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
Diffstat (limited to 'jjb/releng/automate.yml')
-rw-r--r--jjb/releng/automate.yml6
1 files changed, 3 insertions, 3 deletions
diff --git a/jjb/releng/automate.yml b/jjb/releng/automate.yml
index d12ee5d68..9f2e1ff4e 100644
--- a/jjb/releng/automate.yml
+++ b/jjb/releng/automate.yml
@@ -237,16 +237,16 @@
name: 'testapi-automate-docker-deploy-macro'
builders:
- shell: |
- bash ./jjb/releng/docker-deploy.sh "sudo docker run -dti -p 8082:8000
+ sudo bash ./jjb/releng/docker-deploy.sh "sudo docker run -dti --name testapi -p 8082:8000
-e mongodb_url=mongodb://172.17.0.1:27017
-e base_url=http://testresults.opnfv.org/test opnfv/testapi" \
- "http://testresults.opnfv.org/test/swagger/APIs" "testapi"
+ "http://testresults.opnfv.org/test" "testapi"
- builder:
name: 'reporting-automate-docker-deploy-macro'
builders:
- shell: |
- bash ./jjb/releng/docker-deploy.sh "sudo docker run -itd -p 8084:8000 opnfv/reporting" \
+ sudo bash ./jjb/releng/docker-deploy.sh "sudo docker run -itd --name reporting -p 8084:8000 opnfv/reporting" \
"http://testresults.opnfv.org/reporting2/reporting/index.html" "reporting"
- builder: