Modifying catalogue execution test to resolve component pipeline issue

Following validations were detecting changes in the image
used by CI and reporting them as issues.
While correct in case of a customer deployment,
it is unnecessary within the component pipeline.

The catalogue test will now no longer execute this validation.
    - image-serve

Following validations will recieve variable overrides.
    - check-disk-space
    - check-disk-space-pre-upgrade
    - undercloud-disk-space-pre-upgrade
    - undercloud-disk-space

Closes-Bug: #1959864

Signed-off-by: Jiri Podivin <jpodivin@redhat.com>
Change-Id: I24d04038b5add2a02577c94a5d7642e2e620088a
(cherry picked from commit d7821d1347)
This commit is contained in:
Jiri Podivin
2022-02-03 08:54:18 +01:00
parent e9f1f5c0f2
commit da52c1136a
5 changed files with 25 additions and 2 deletions

View File

@@ -17,3 +17,4 @@ validation_component: "{{ job.component|default('validation') }}"
cli_command: "validation"
run_validation: true
execute_full_vf_catalogue: "{{ job.execute_full_vf_catalogue|default(false)|bool }}"
vf_catalogue_overrides: "{{ ansible_user_dir }}/catalog_vars_override.yaml"

View File

@@ -0,0 +1,11 @@
---
# LP#1959864
volumes:
- {mount: /var/lib/docker, min_size: 10}
- {mount: /var/lib/config-data, min_size: 3}
- {mount: /var/log, min_size: 3}
- {mount: /usr, min_size: 5}
- {mount: /var, min_size: 8}
- {mount: /, min_size: 8}
minimal_ram_gb: 2

View File

@@ -12,4 +12,5 @@
--output-log validation_catalogue_execution.log
{{ validation_catalogue.extra_args }}
{{ validation_catalogue.extra_env_args }}
--extra-vars-file={{ vf_catalogue_overrides }}
executable: /bin/bash

View File

@@ -115,6 +115,15 @@
- validation_component | length > 0
with_dict: "{{ validations_list[validation_component] }}"
- name: Import variable overrides
become: true
copy:
src: files/catalog_vars_override.yaml
dest: "{{ vf_catalogue_overrides }}"
mode: "0644"
owner: "{{ ansible_user }}"
group: "{{ ansible_user }}"
- name: Execute entire validations catalogue
include_tasks: execute_full_catalogue.yaml
when: execute_full_vf_catalogue

View File

@@ -65,7 +65,7 @@ validation_list_formats:
# extra_env_args and extra_args are shared for the execution
# Included validations will be sorted alphabetically.
validation_catalogue:
extra_args: "--extra-vars minimal_ram_gb=2"
extra_args: ""
extra_env_args: "{{ extra_env_vars | default('') }}"
full_list:
- 512e
@@ -86,7 +86,6 @@ validation_catalogue:
- dhcp-provisioning
- dns
- healthcheck-service-status
- image-serve
- mysql-open-files-limit
- neutron-sanity-check
- no-op
@@ -149,3 +148,5 @@ validation_catalogue:
# - tls-everywhere-prep
# - undercloud-debug
# - undercloud-service-status
# LP#1959864
# - image-serve