Merge "Use static inventory for component CI role and clean component list"

This commit is contained in:
Zuul 2021-03-18 22:49:02 +00:00 committed by Gerrit Code Review
commit ebc1025a5f
3 changed files with 4 additions and 4 deletions

View File

@ -2,6 +2,7 @@
val_working_dir: "{{ working_dir }}" val_working_dir: "{{ working_dir }}"
validation_log_dir: "/var/log/validations" validation_log_dir: "/var/log/validations"
validation_environment: "{{ job.environment_type|default('undercloud') }}" validation_environment: "{{ job.environment_type|default('undercloud') }}"
tripleo_inventory: "tripleo-ansible-inventory.yaml"
# Passing default to component, allow to run the role outside of CI # Passing default to component, allow to run the role outside of CI
component: "{{ job.component|default(None) }}" component: "{{ job.component|default(None) }}"
# both commands can be used: # both commands can be used:

View File

@ -13,7 +13,7 @@
register: run_validation_list register: run_validation_list
shell: | shell: |
export OS_CLOUD={{ validation_environment }} export OS_CLOUD={{ validation_environment }}
{{ validation_command }} run --validation {{ item }} > validation_{{ item }}.log 2>&1 {{ validation_command }} run --validation {{ item }} --static-inventory {{ val_working_dir }}/{{ tripleo_inventory }} > validation_{{ item }}.log 2>&1
when: when:
- run_from_list|bool - run_from_list|bool
loop: "{{ validations_list[component] }}" loop: "{{ validations_list[component] }}"

View File

@ -2,15 +2,14 @@
validations_list: validations_list:
compute: compute:
- nova-status - nova-status
- nova-svirt
network: network:
- neutron-sanity-check - undercloud-neutron-sanity-check
validation: validation:
- check-ram - check-ram
- check-cpu - check-cpu
- 512e - 512e
tripleo: tripleo:
- undercloud-disk-space - undercloud-process-count
validations_group: validations_group:
compute: compute:
- compute - compute