openstack/tripleo-quickstart-extras
Code Issues Proposed changes

Remove logs reserved time from deploy_timeout args

Browse Source 
After https://review.openstack.org/#/c/531884/ was merged, we
don't need anymore to save 10 minutes for logs collection
in multinode jobs. Still need this in ovb jobs though.

Change-Id: I9942b5e088f0d46608e7b2bd6569ff39a0736306
This commit is contained in:
Sagi Shnaidman 2018-01-08 21:40:12 +02:00
parent 8c7940da40
commit 5f5cd0adaf
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
roles/overcloud-deploy/tasks/pre-deploy.yml
View File

@ -236,9 +236,21 @@
when: when:
- overcloud_neutron_global_physnet_mtu is defined - overcloud_neutron_global_physnet_mtu is defined
# 15 is "reserved time for logs=10" + 5 minutes for inventory role # 15 is "reserved time for logs=10" + 5 minutes for inventory role for OVB jobs
# Time must be synchronised on hosts # Time must be synchronised on hosts
- name: Set overcloud deployment timeout in CI - name: Set overcloud deployment timeout in CI for OVB
set_fact: set_fact:
deploy_timeout: "{{ ((ci_job_end_time|int - lookup('pipe','date +%s')|int)/60)|int -15 }}" deploy_timeout: "{{ ((ci_job_end_time|int - lookup('pipe','date +%s')|int)/60)|int -15 }}"
when: ci_job_end_time is defined when:
- ci_job_end_time is defined
- '"ovb" in lookup("env", "TOCI_JOBTYPE")'
# 5 is "reserved time for 5 minutes for inventory role for multinode jobs
# Time must be synchronised on hosts
- name: Set overcloud deployment timeout in CI for multinode
set_fact:
deploy_timeout: "{{ ((ci_job_end_time|int - lookup('pipe','date +%s')|int)/60)|int -5 }}"
when:
- ci_job_end_time is defined
- '"ovb" not in lookup("env", "TOCI_JOBTYPE")'