openstack
/
tripleo-upgrade
Code Issues Proposed changes

Merge "Create workload_launch script when sanity testing is enabled"

This commit is contained in:
Zuul 2020-08-20 15:48:44 +00:00 committed by Gerrit Code Review
parent 854f084fbf 45c2b65361
commit e7a5d90f35
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tasks/main.yml
View File

@ -1,17 +1,17 @@
---
# tasks file for tripleo-upgrade
- block:
- name: prepare workload scripts
include_tasks: common/create_workload.yml
- name: launch workload
shell: |
set -o pipefail
bash {{ workload_launch_script }} 2>&1 {{ timestamper_cmd }} > workload_launch.log
args:
chdir: "{{ working_dir }}"
- name: prepare workload scripts
include_tasks: common/create_workload.yml
when: workload_launch|bool or launch_sanity_workload|bool
tags: always
- name: launch workload
shell: |
set -o pipefail
bash {{ workload_launch_script }} 2>&1 {{ timestamper_cmd }} > workload_launch.log
args:
chdir: "{{ working_dir }}"
when: workload_launch|bool
tags: always

2
templates/fast-forward-upgrade/overcloud_upgrade_run.sh.j2
View File

@ -91,6 +91,6 @@ source {{ overcloud_rc }}
kill -9 $( lsof -t {{ working_dir }}/fip_http_check_start.sh )
bash {{ working_dir }}/fip_http_check_stop.sh
{% endif %}
{% if launch_sanity_workload|bool and workload_launch|bool %}
{% if launch_sanity_workload|bool %}
bash {{ working_dir }}/workload_launch.sh 'sanity'
{% endif %}