From 659af0aeb89ff2c85eb75de1332655d9eb9c4265 Mon Sep 17 00:00:00 2001
From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Wed, 6 Feb 2019 10:37:40 +0100
Subject: [PATCH] ceph-ansible-nightly: fix nightly jobs (stable-3.2)

fix all nightly jobs for stable-3.2 since recent refact in ceph-ansible
testing.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
---
 .../definitions/ceph-ansible-nightly.yml      | 63 +++++++++++++------
 1 file changed, 44 insertions(+), 19 deletions(-)

diff --git a/ceph-ansible-nightly/config/definitions/ceph-ansible-nightly.yml b/ceph-ansible-nightly/config/definitions/ceph-ansible-nightly.yml
index 934ae9d8..d545118a 100644
--- a/ceph-ansible-nightly/config/definitions/ceph-ansible-nightly.yml
+++ b/ceph-ansible-nightly/config/definitions/ceph-ansible-nightly.yml
@@ -2,6 +2,12 @@
     name: ceph-ansible-nightly-jewel
     release:
       - jewel
+    distribution:
+      - centos
+      - ubuntu
+    deployment:
+      - container
+      - non_container
     scenario:
       - centos7_cluster
       - xenial_cluster
@@ -25,12 +31,18 @@
       - stable-3.0
       - stable-3.1
     jobs:
-      - 'ceph-ansible-nightly-{release}-{ceph_ansible_branch}-{scenario}'
+      - 'ceph-ansible-nightly-{release}-{distribution}-{deployment}-{ceph_ansible_branch}-{scenario}'
 
 - project:
     name: ceph-ansible-nightly-stable3.0
     release:
       - luminous
+    distribution:
+      - centos
+      - ubuntu
+    deployment:
+      - container
+      - non_container
     scenario:
       - centos7_cluster
       - xenial_cluster
@@ -57,13 +69,19 @@
     ceph_ansible_branch:
       - stable-3.0
     jobs:
-        - 'ceph-ansible-nightly-{release}-{ceph_ansible_branch}-{scenario}'
+        - 'ceph-ansible-nightly-{release}-{distribution}-{deployment}-{ceph_ansible_branch}-{scenario}'
 
 - project:
     name: ceph-ansible-nightly-stable3.1
     release:
       - luminous
       - mimic
+    distribution:
+      - centos
+      - ubuntu
+    deployment:
+      - container
+      - non_container
     scenario:
       - centos7_cluster
       - xenial_cluster
@@ -92,37 +110,42 @@
     ceph_ansible_branch:
       - stable-3.1
     jobs:
-        - 'ceph-ansible-nightly-{release}-{ceph_ansible_branch}-{scenario}'
+        - 'ceph-ansible-nightly-{release}-{distribution}-{deployment}-{ceph_ansible_branch}-{scenario}'
 
 - project:
     name: ceph-ansible-nightly-stable3.2
     release:
       - luminous
-      - mimic
+    distribution:
+      - centos
+      - ubuntu
+    deployment:
+      - container
+      - non_container
     scenario:
-      - centos7_cluster
-      - xenial_cluster
-      - docker_cluster
-      - update_cluster
+      - all_daemons
+      - cluster
+      - collocation
+      - update
+      - bluestore_lvm_osds
       - lvm_osds
-      - purge_lvm_osds
-      - docker_cluster_collocation
-      - update_docker_cluster
-      - switch_to_containers
       - shrink_mon
-      - shrink_mon_container
       - shrink_osd
-      - shrink_osd_container
-      - purge_cluster_container
-      - purge_cluster_non_container
+      - lvm_batch
+      - add_osds
+      - rgw_multisite
+      - purge
+      - lvm_auto_discovery
+      - podman
+      - switch_to_containers
       - ooo_collocation
     ceph_ansible_branch:
       - stable-3.2
     jobs:
-        - 'ceph-ansible-nightly-{release}-{ceph_ansible_branch}-{scenario}'
+        - 'ceph-ansible-nightly-{release}-{distribution}-{deployment}-{ceph_ansible_branch}-{scenario}'
 
 - job-template:
-    name: 'ceph-ansible-nightly-{release}-{ceph_ansible_branch}-{scenario}'
+    name: 'ceph-ansible-nightly-{release}-{distribution}-{deployment}-{ceph_ansible_branch}-{scenario}'
     node: vagrant&&libvirt&&centos7
     concurrent: true
     defaults: global
@@ -162,9 +185,11 @@
     builders:
       - inject:
           properties-content: |
-            SCENARIO={scenario}
             RELEASE={release}
+            DISTRIBUTION={distribution}
+            DEPLOYMENT={deployment}
             CEPH_ANSIBLE_BRANCH={ceph_ansible_branch}
+            SCENARIO={scenario}
       - shell:
           !include-raw-escape:
             - ../../../scripts/build_utils.sh
-- 
2.39.5