From 8c28b3c7661f00fc439ab3a310bf2bc27577db68 Mon Sep 17 00:00:00 2001
From: Mathieu Bultel <mat.bultel@gmail.com>
Date: Tue, 23 Feb 2021 22:59:04 +0100
Subject: [PATCH] Use static inventory for component CI role and clean
 component list

* Use static inventory for tripleo-validations role for component CI
* Remove nova-svirt from the component compute list since this validation
is not made for running on Standalone deployment.
* Moving neutron-sanity-check to undercloud-neutron-sanity-check because
this validation is made for being kicked against an Overcloud
* And replace disk-check by process count for Component CI PoC

Signed-off-by: Jiri Podivin <jpodivin@redhat.com>
Change-Id: I2de47f7226c232226712cf45be7d1dfb4b62873a
(cherry picked from commit 9f5b4167baad1653c9cf40eb7a4520b56edcb934)
---
 roles/tripleo_validations/defaults/main.yml | 1 +
 roles/tripleo_validations/tasks/run.yml     | 2 +-
 roles/tripleo_validations/vars/main.yml     | 5 ++---
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/roles/tripleo_validations/defaults/main.yml b/roles/tripleo_validations/defaults/main.yml
index 00d27f4d1..107a240e3 100644
--- a/roles/tripleo_validations/defaults/main.yml
+++ b/roles/tripleo_validations/defaults/main.yml
@@ -2,6 +2,7 @@
 val_working_dir: "{{ working_dir }}"
 validation_log_dir: "/var/log/validations"
 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
 component: "{{ job.component|default(None) }}"
 # both commands can be used:
diff --git a/roles/tripleo_validations/tasks/run.yml b/roles/tripleo_validations/tasks/run.yml
index c8d2f75a6..b0ec49651 100644
--- a/roles/tripleo_validations/tasks/run.yml
+++ b/roles/tripleo_validations/tasks/run.yml
@@ -13,7 +13,7 @@
   register: run_validation_list
   shell: |
     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:
     - run_from_list|bool
   loop: "{{ validations_list[component] }}"
diff --git a/roles/tripleo_validations/vars/main.yml b/roles/tripleo_validations/vars/main.yml
index 1acc015ab..3aaed6171 100644
--- a/roles/tripleo_validations/vars/main.yml
+++ b/roles/tripleo_validations/vars/main.yml
@@ -2,15 +2,14 @@
 validations_list:
   compute:
     - nova-status
-    - nova-svirt
   network:
-    - neutron-sanity-check
+    - undercloud-neutron-sanity-check
   validation:
     - check-ram
     - check-cpu
     - 512e
   tripleo:
-    - undercloud-disk-space
+    - undercloud-process-count
 validations_group:
   compute:
     - compute