From: Alex Ermolov Date: Fri, 18 Mar 2016 21:56:47 +0000 (+0300) Subject: jenkins: patch_environment job fixes and enhancements X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=70f03716cb353ca1657e6dacd05f35c97a1cbd80;p=tools%2Fsustaining.git jenkins: patch_environment job fixes and enhancements Change-Id: Iec434ba6a1c762f6a3465166df16e43344de3f3e --- diff --git a/jenkins/testing_automation/ansible/install.yml b/jenkins/testing_automation/ansible/install.yml index 9145df3..cf3d82e 100644 --- a/jenkins/testing_automation/ansible/install.yml +++ b/jenkins/testing_automation/ansible/install.yml @@ -62,3 +62,4 @@ with_items: - common_vars.yml - patch_environment.yml + - cleanup_knownhosts.yml diff --git a/jenkins/testing_automation/ansible/playbooks/patch_environment.yml b/jenkins/testing_automation/ansible/playbooks/patch_environment.yml index d89dd6b..5fcce52 100644 --- a/jenkins/testing_automation/ansible/playbooks/patch_environment.yml +++ b/jenkins/testing_automation/ansible/playbooks/patch_environment.yml @@ -1,5 +1,8 @@ - hosts: localhost + vars: + wait_for_min: 3 + tasks: - include_vars: common_vars.yml @@ -19,9 +22,6 @@ - rsync sudo: yes - - name: sync Nailgun updates - shell: "rsync -vap --chmod=Dugo+x rsync://fuel-repository.mirantis.com/mirror/fwm/{{ mos_version }}/updates/ /var/www/nailgun/updates/" - - name: download update script shell: "wget https://github.com/Mirantis/tools-sustaining/raw/master/scripts/mos_apply_mu.py" @@ -29,14 +29,7 @@ shell: "python mos_apply_mu.py --update --all-envs --master-ip={{ master_node_ip }}" - name: wait for node updates to complete - pause: minutes=3 # TODO custom task for recurrent check + pause: minutes={{ wait_for_min }} # TODO custom task for recurrent check - name: check update status shell: "python mos_apply_mu.py --check --all-envs --master-ip={{ master_node_ip }}" - - -- hosts: localhost - - tasks: - - name: zip Tempest report files set - shell: tar cvvf tempest-report.tar ./tempest-report