ceph-ansible: update pipeline for stable-3.2

introduce the same refact in stable-3.2 than the one introduced in
master

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>

diff --git a/ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml b/ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml
index bda951dcac30606ba8dfb1f318488d9e1f5893c9..8346ebd900fd5fb33a60eaeef694c0eabdb774ae 100644 (file)
--- a/ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml
+++ b/ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml
@@ -90,9 +90,9 @@
                 condition: SUCCESSFUL
                 execution-type: PARALLEL
                 projects:
-                  - name: 'ceph-ansible-prs-luminous-add_osds'
+                  - name: 'ceph-ansible-prs-luminous-centos-non_container-add_osds'
                     current-parameters: true
-                  - name: 'ceph-ansible-prs-luminous-add_osds_container'
+                  - name: 'ceph-ansible-prs-luminous-centos-container-add_osds'
                     current-parameters: true
       - conditional-step:
           condition-kind: shell
@@ -176,7 +176,7 @@
                 condition: SUCCESSFUL
                 execution-type: PARALLEL
                 projects:
-                  - name: 'ceph-ansible-prs-luminous-purge_cluster_container'
+                  - name: 'ceph-ansible-prs-luminous-centos-container-purge'
                     current-parameters: true
       - conditional-step:
           condition-kind: shell
@@ -195,7 +195,7 @@
                 condition: SUCCESSFUL
                 execution-type: PARALLEL
                 projects:
-                  - name: 'ceph-ansible-prs-luminous-purge_cluster_non_container'
+                  - name: 'ceph-ansible-prs-luminous-centos-non_container-purge'
                     current-parameters: true
       - conditional-step:
           condition-kind: shell
@@ -235,9 +235,9 @@
                 condition: SUCCESSFUL
                 execution-type: PARALLEL
                 projects:
-                  - name: 'ceph-ansible-prs-luminous-update_cluster'
+                  - name: 'ceph-ansible-prs-luminous-centos-non_container-update'
                     current-parameters: true
-                  - name: 'ceph-ansible-prs-luminous-update_docker_cluster'
+                  - name: 'ceph-ansible-prs-luminous-centos-container-update'
                     current-parameters: true
       - conditional-step:
           condition-kind: shell
@@ -277,9 +277,9 @@
                 condition: SUCCESSFUL
                 execution-type: PARALLEL
                 projects:
-                  - name: 'ceph-ansible-prs-luminous-shrink_mon'
+                  - name: 'ceph-ansible-prs-luminous-centos-non_container-shrink_mon'
                     current-parameters: true
-                  - name: 'ceph-ansible-prs-luminous-shrink_mon_container'
+                  - name: 'ceph-ansible-prs-luminous-centos-container-shrink_mon'
                     current-parameters: true
       - conditional-step:
           condition-kind: shell
@@ -319,9 +319,9 @@
                 condition: SUCCESSFUL
                 execution-type: PARALLEL
                 projects:
-                  - name: 'ceph-ansible-prs-luminous-shrink_osd'
+                  - name: 'ceph-ansible-prs-luminous-centos-non_container-shrink_osd'
                     current-parameters: true
-                  - name: 'ceph-ansible-prs-luminous-shrink_osd_container'
+                  - name: 'ceph-ansible-prs-luminous-centos-container-shrink_osd'
                     current-parameters: true
       - conditional-step:
           condition-kind: shell
@@ -403,9 +403,9 @@
                 condition: SUCCESSFUL
                 execution-type: PARALLEL
                 projects:
-                  - name: 'ceph-ansible-prs-luminous-bluestore_lvm_osds'
+                  - name: 'ceph-ansible-prs-luminous-centos-non_container-bluestore_lvm_osds'
                     current-parameters: true
-                  - name: 'ceph-ansible-prs-luminous-bluestore_lvm_osds_container'
+                  - name: 'ceph-ansible-prs-luminous-centos-container-bluestore_lvm_osds'
                     current-parameters: true
       - conditional-step:
           condition-kind: shell
@@ -457,9 +457,9 @@
                 condition: SUCCESSFUL
                 execution-type: PARALLEL
                 projects:
-                  - name: 'ceph-ansible-prs-luminous-rgw_multisite'
+                  - name: 'ceph-ansible-prs-luminous-centos-non_container-rgw_multisite'
                     current-parameters: true
-                  - name: 'ceph-ansible-prs-luminous-rgw_multisite_container'
+                  - name: 'ceph-ansible-prs-luminous-centos-container-rgw_multisite'
                     current-parameters: true
       - conditional-step:
           condition-kind: shell
@@ -544,11 +544,11 @@
                 condition: SUCCESSFUL
                 execution-type: PARALLEL
                 projects:
-                  - name: 'ceph-ansible-prs-luminous-centos7_cluster'
+                  - name: 'ceph-ansible-prs-luminous-centos-non_container-cluster'
                     current-parameters: true
-                  - name: 'ceph-ansible-prs-luminous-docker_cluster'
+                  - name: 'ceph-ansible-prs-luminous-centos-container-cluster'
                     current-parameters: true
-                  - name: 'ceph-ansible-prs-luminous-docker_cluster_collocation'
+                  - name: 'ceph-ansible-prs-luminous-centos-container-collocation'
                     current-parameters: true
                   - name: 'ceph-ansible-prs-luminous-ooo_collocation'
                     current-parameters: true

diff --git a/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml b/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml
index 69027c225ba437f587040d33960a8f31d431786d..51e92cb40ec42a8a6d9deabae6af398c3bcb9bce 100644 (file)
--- a/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml
+++ b/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml
@@ -1,9 +1,10 @@
 # new jobs definitions for ceph-ansible scenario refact (see: https://github.com/ceph/ceph-ansible/pull/3364)
 - project:
-    name: ceph-ansible-prs-pipeline-dev
+    name: ceph-ansible-prs-pipeline
     slave_labels: 'vagrant && libvirt && smithi'
     release:
       - dev
+      - luminous
     distribution:
       - centos
       - ubuntu
@@ -24,11 +25,11 @@
       - rgw_multisite
       - purge
     jobs:
-        - 'ceph-ansible-prs-pipeline-dev'
+        - 'ceph-ansible-prs-pipeline'
 
 - job-template:
     name: 'ceph-ansible-prs-{release}-{distribution}-{deployment}-{scenario}'
-    id: 'ceph-ansible-prs-pipeline-dev'
+    id: 'ceph-ansible-prs-pipeline'
     node: '{slave_labels}'
     concurrent: true
     defaults: global