From 57278a93eb183eba9bdf54b67c914ca41ec44f3b Mon Sep 17 00:00:00 2001
From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Mon, 4 Feb 2019 14:23:14 +0100
Subject: [PATCH] ceph-ansible: add rhel8/podman scenario

This commit does the following:

- add an upstream test against rhel8/podman to catch earlier potential
failures.
- refact a bit the pipeline (since there's a check if the scenario
actually exist in build_utils.sh we can define a global matrix).

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
---
 .../definitions/ceph-ansible-pipeline.yml     |  2 ++
 .../config/definitions/ceph-ansible-prs.yml   | 33 ++-----------------
 2 files changed, 4 insertions(+), 31 deletions(-)

diff --git a/ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml b/ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml
index 8b7fabe6..d85844c1 100644
--- a/ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml
+++ b/ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml
@@ -511,6 +511,8 @@
                 projects:
                   - name: 'ceph-ansible-prs-dev-centos-non_container-all_daemons'
                     current-parameters: true
+                  - name: 'ceph-ansible-prs-dev-rhel-container-podman'
+                    current-parameters: true
                   - name: 'ceph-ansible-prs-dev-centos-container-all_daemons'
                     current-parameters: true
                   - name: 'ceph-ansible-prs-dev-centos-container-collocation'
diff --git a/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml b/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml
index ad37d6a9..a2b34575 100644
--- a/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml
+++ b/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml
@@ -7,6 +7,7 @@
       - luminous
     distribution:
       - centos
+      - rhel
       - ubuntu
     deployment:
       - container
@@ -25,38 +26,8 @@
       - rgw_multisite
       - purge
       - lvm_auto_discovery
-    jobs:
-        - 'ceph-ansible-prs-pipeline'
-
-- project:
-    name: ceph-ansible-prs-pipeline-switch
-    slave_labels: 'vagrant && libvirt && smithi'
-    release:
-      - dev
-      - luminous
-    distribution:
-      - centos
-      - ubuntu
-    deployment:
-      - non_container
-    scenario:
-      - switch_to_containers
-    jobs:
-        - 'ceph-ansible-prs-pipeline'
-
-- project:
-    name: ceph-ansible-prs-pipeline-containers
-    slave_labels: 'vagrant && libvirt && smithi'
-    release:
-      - dev
-      - luminous
-    distribution:
-      - centos
-      - ubuntu
-    deployment:
-      - container
-    scenario:
       - podman
+      - switch_to_containers
       - ooo_collocation
     jobs:
         - 'ceph-ansible-prs-pipeline'
-- 
2.39.5