From 4a05320ddf610b5a23396b876a394c28f4d47191 Mon Sep 17 00:00:00 2001 From: "Gael Chamoulaud (Strider)" Date: Wed, 12 May 2021 10:14:05 +0200 Subject: [PATCH] Add testing for custom callback feature This patch adds a custom callback to the execution of the check-cpu and check-ram validations. Change-Id: Ic9391998dcad74dd82cab4c29de46343663225c6 Signed-off-by: Gael Chamoulaud (Strider) --- roles/validations/tasks/run.yaml | 9 +++++++-- roles/validations/vars/main.yaml | 6 ++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/roles/validations/tasks/run.yaml b/roles/validations/tasks/run.yaml index 5da41d2..e0c8b57 100644 --- a/roles/validations/tasks/run.yaml +++ b/roles/validations/tasks/run.yaml @@ -2,8 +2,13 @@ - name: Run validations register: run_validation shell: - cmd: "{{ validation_command }} run --validation {{ name.key }} {{ validation_dir }} {{ ansible_dir }} \ - --inventory {{ inventory }} --output-log validation_{{ name.key }}.log {{ name.value.extra_args }}" + cmd: >- + {{ validation_command }} run --validation {{ name.key }} + {{ validation_dir }} {{ ansible_dir }} + --inventory {{ inventory }} + --output-log validation_{{ name.key }}.log + {{ name.value.extra_args }} + {{ name.value.extra_env_args }} executable: /bin/bash - name: Get Run results diff --git a/roles/validations/vars/main.yaml b/roles/validations/vars/main.yaml index 3226d6c..5393365 100644 --- a/roles/validations/vars/main.yaml +++ b/roles/validations/vars/main.yaml @@ -3,19 +3,25 @@ validations_list: compute: - nova-status: extra_args: "" + extra_env_args: "" network: - undercloud-neutron-sanity-check: extra_args: "" + extra_env_args: "" validation: - check-cpu: extra_args: "--extra-vars minimal_cpu_count=2" + extra_env_args: "--extra-env-vars ANSIBLE_STDOUT_CALLBACK=default" - 512e: extra_args: "" + extra_env_args: "" - check-ram: extra_args: "--extra-vars minimal_ram_gb=2" + extra_env_args: "--extra-env-vars ANSIBLE_STDOUT_CALLBACK=default" tripleo: - undercloud-process-count: extra_args: "" + extra_env_args: "" validations_group: compute: - compute