From c93b846e8f62fe7e833fa30d7645f431ee7684ef Mon Sep 17 00:00:00 2001
From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Wed, 12 Aug 2020 11:03:50 +0200
Subject: [PATCH] ceph-ansible: refact project definition

This commit modifies the current project definitions:

1/ it uses the exclude keyword to avoid duplicating project
2/ it declares a new project to only use smithi nodes for 'large'
scenario testing (basically all scenario based on 'all_daemons'
scenario).
3/ exclude 'non_container-cephadm_adopt' for non_containerized
deployments
4/ reindent jobs section

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
---
 .../config/definitions/ceph-ansible-prs.yml   | 61 ++++++++-----------
 1 file changed, 24 insertions(+), 37 deletions(-)

diff --git a/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml b/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml
index 81117f3c..5814c866 100644
--- a/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml
+++ b/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml
@@ -1,6 +1,6 @@
 - project:
-    name: ceph-ansible-prs
-    slave_labels: 'vagrant && libvirt && (smithi || braggi || centos7)'
+    name: ceph-ansible-prs-smithi
+    slave_labels: 'centos7 && libvirt && smithi && vagrant'
     distribution:
       - centos
     deployment:
@@ -8,51 +8,35 @@
       - non_container
     scenario:
       - all_daemons
-      - lvm_osds
       - update
       - purge
-      - collocation
-      - lvm_batch
-      - all_in_one
-      - external_clients
-    jobs:
-        - 'ceph-ansible-prs-auto'
-
-- project:
-    name: ceph-ansible-prs-ooo
-    slave_labels: 'vagrant && libvirt && (smithi || braggi || centos7)'
-    distribution:
-      - centos
-    deployment:
-      - container
-    scenario:
-      - ooo_collocation
+      - switch_to_containers
+    exclude:
+      - deployment: container
+        scenario: switch_to_containers
+      - deployment: non_container
+        scenario: ooo_collocation
+      - deployment: non_container
+        scenario: podman
     jobs:
-        - 'ceph-ansible-prs-auto'
+      - 'ceph-ansible-prs-auto'
 
 - project:
-    name: ceph-ansible-prs-podman
+    name: ceph-ansible-prs
     slave_labels: 'vagrant && libvirt && (smithi || braggi || centos7)'
     distribution:
       - centos
     deployment:
       - container
-    scenario:
-      - podman
-    jobs:
-        - 'ceph-ansible-prs-auto'
-
-- project:
-    name: ceph-ansible-prs-auto-switch_to_container
-    slave_labels: 'vagrant && libvirt && (smithi || braggi || centos7)'
-    distribution:
-      - centos
-    deployment:
       - non_container
     scenario:
-      - switch_to_containers
+      - lvm_osds
+      - collocation
+      - lvm_batch
+      - all_in_one
+      - external_clients
     jobs:
-        - 'ceph-ansible-prs-auto'
+      - 'ceph-ansible-prs-auto'
 
 - project:
     name: ceph-ansible-prs-docker2podman
@@ -64,7 +48,7 @@
     scenario:
       - docker_to_podman
     jobs:
-        - 'ceph-ansible-prs-common-trigger'
+      - 'ceph-ansible-prs-common-trigger'
 
 - project:
     name: ceph-ansible-prs-cephadm
@@ -76,7 +60,7 @@
     scenario:
       - cephadm
     jobs:
-        - 'ceph-ansible-prs-common-trigger'
+      - 'ceph-ansible-prs-common-trigger'
 
 - project:
     name: ceph-ansible-prs-common-trigger
@@ -105,8 +89,11 @@
       - lvm_auto_discovery
       - filestore_to_bluestore
       - cephadm_adopt
+    exclude:
+      - deployment: non_container
+        scenario: cephadm_adopt
     jobs:
-        - 'ceph-ansible-prs-common-trigger'
+      - 'ceph-ansible-prs-common-trigger'
 
 - job-template:
     name: 'ceph-ansible-prs-{distribution}-{deployment}-{scenario}'
-- 
2.39.5