From 044882ae357c45b83c959129f52bd7d9b7062359 Mon Sep 17 00:00:00 2001
From: Sofer Athlan-Guyot <sathlang@redhat.com>
Date: Wed, 12 Jul 2023 16:00:59 +0200
Subject: [PATCH] Skip check-reboot from post update validation.

check-reboot will report a failure if reboot is needed, which is often
the case after update.

Just skip this informative check to avoid ci failure.

We add a new variable because skiplist_validations will be overwriten
by infrared. So to be able to define a hardcoded check to skip at the
stage level, we need a brand new variable.

Change-Id: I2248263386b9d581c2e75707d0c9fdf1fb888355
---
 README.rst                             | 5 +++++
 defaults/main.yml                      | 1 +
 tasks/common/validation_group_run.yaml | 3 ++-
 tasks/update/main.yml                  | 1 +
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index 7b17a7f3..a4a5f90b 100644
--- a/README.rst
+++ b/README.rst
@@ -169,6 +169,11 @@ URL of an iperf binary.
 
     tripleo_upgrade_iperf_bin_url: https://github.com/userdocs/iperf3-static/releases/download/3.12%2B/iperf3-amd64
 
+Add validations to skip for a certain stage (post-update, pre-update, ...) in the form of comma separated string. Added to the list of validation to skip. Default to empty list.
+
+    skiplist_validations_stage: ''
+
+
 Dependencies
 ------------
 
diff --git a/defaults/main.yml b/defaults/main.yml
index c12a5682..9a9310a5 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -58,6 +58,7 @@ run_validations: false
 
 # comma separated list of skipped validations
 skiplist_validations: ''
+skiplist_validations_stage: ''
 
 # Validation Ansible inventory for Upgrade
 upgrade_validation_inventory: "{{ working_dir }}/overcloud-deploy/{{ overcloud_stack_name }}/config-download/{{ overcloud_stack_name }}/tripleo-ansible-inventory.yaml"
diff --git a/tasks/common/validation_group_run.yaml b/tasks/common/validation_group_run.yaml
index 3f3adad4..27449290 100644
--- a/tasks/common/validation_group_run.yaml
+++ b/tasks/common/validation_group_run.yaml
@@ -1,6 +1,7 @@
 ---
 # validation_group: validation group to execute
 # skiplist_validations: comma separated string of the validations to be skipped in a group
+# skiplist_validations_stage: comma separated string of the validations to be skipped in a group defined for a stage, added to the list.
 # validation_allowed_groups: list of allowed groups to run
 # validation_args: string containing extra arguments for the validation command. (defaults to empty string)
 - block:
@@ -9,7 +10,7 @@
       register: validations_in_group
     - name: Set fact validations_filtered which removes validations from skiplist
       set_fact:
-        validations_filtered: "{{ validations_in_group.stdout_lines | difference( skiplist_validations.split(',') ) }}"
+        validations_filtered: "{{ validations_in_group.stdout_lines | difference( skiplist_validations.split(',') +  skiplist_validations_stage.split(',') ) }}"
     - name: "Running validations {{ validations_filtered }}"
       register: validations_result
       shell: |
diff --git a/tasks/update/main.yml b/tasks/update/main.yml
index 4572e85b..b8c3e68f 100644
--- a/tasks/update/main.yml
+++ b/tasks/update/main.yml
@@ -273,6 +273,7 @@
       vars:
         validation_group: "post-update"
         validation_allowed_groups: "{{ updates_validations_groups }}"
+        skiplist_validations_stage: check-reboot
       when: run_validations|bool
       tags:
         - updates_validations