ceph-ansible: refact nightly jobs

due to recent changes in ceph-ansible, let's refact all nightly jobs
accordingly in order to fix jobs in jenkins.

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

diff --git a/ceph-ansible-nightly/config/definitions/ceph-ansible-nightly.yml b/ceph-ansible-nightly/config/definitions/ceph-ansible-nightly.yml
index 1f9424ce3f3084811c372c652371e563477222f1..adf2a529477d2e6d9d5e79f10d8ee749020cda61 100644 (file)
--- a/ceph-ansible-nightly/config/definitions/ceph-ansible-nightly.yml
+++ b/ceph-ansible-nightly/config/definitions/ceph-ansible-nightly.yml
@@ -1,7 +1,8 @@
 - project:
-    name: ceph-ansible-nightly-jewel
+    name: ceph-ansible-nightly-stable3.1
     release:
       - jewel
+      - luminous
     distribution:
       - centos
       - ubuntu
@@ -9,32 +10,21 @@
       - container
       - non_container
     scenario:
-      - centos7_cluster
-      - xenial_cluster
-      - docker_cluster
-      - update_cluster
-      - docker_cluster_collocation
-      - update_docker_cluster
-      - switch_to_containers
+      - all_daemons
+      - update
+      - purge
+      - collocation
       - shrink_mon
-      - shrink_mon_container
       - shrink_osd
-      - shrink_osd_container
-      - filestore_osds_non_container
-      - filestore_osds_container
-      - purge_cluster_container
-      - purge_cluster_non_container
-      - purge_filestore_osds_container
-      - purge_filestore_osds_non_container
-      - ooo_collocation
+      - filestore_osds
+      - purge_filestore
     ceph_ansible_branch:
-      - stable-3.0
       - stable-3.1
     jobs:
-      - 'ceph-ansible-nightly-{release}-{distribution}-{deployment}-{ceph_ansible_branch}-{scenario}'
+        - 'ceph-ansible-nightly-{release}-{distribution}-{deployment}-{ceph_ansible_branch}-{scenario}'
 
 - project:
-    name: ceph-ansible-nightly-stable3.0
+    name: ceph-ansible-nightly-luminous-stable3.1
     release:
       - luminous
     distribution:
@@ -44,68 +34,44 @@
       - container
       - non_container
     scenario:
-      - centos7_cluster
-      - xenial_cluster
-      - docker_cluster
-      - update_cluster
-      - docker_cluster_collocation
-      - update_docker_cluster
-      - switch_to_containers
-      - shrink_mon
-      - shrink_mon_container
-      - shrink_osd
-      - shrink_osd_container
-      - bluestore_osds_non_container
-      - bluestore_osds_container
-      - filestore_osds_non_container
-      - filestore_osds_container
-      - purge_cluster_container
-      - purge_cluster_non_container
-      - purge_filestore_osds_container
-      - purge_filestore_osds_non_container
-      - purge_bluestore_osds_container
-      - purge_bluestore_osds_non_container
-      - ooo_collocation
+      - lvm_osds
+      - purge_lvm_osds
+      - bluestore_osds
+      - purge_bluestore
+      - bluestore_lvm_osds
     ceph_ansible_branch:
-      - stable-3.0
+      - stable-3.1
     jobs:
         - 'ceph-ansible-nightly-{release}-{distribution}-{deployment}-{ceph_ansible_branch}-{scenario}'
 
 - project:
-    name: ceph-ansible-nightly-stable3.1
+    name: ceph-ansible-nightly-non_container-stable3.1
     release:
+      - jewel
       - luminous
-      - mimic
     distribution:
       - centos
       - ubuntu
     deployment:
-      - container
       - non_container
     scenario:
-      - centos7_cluster
-      - xenial_cluster
-      - docker_cluster
-      - update_cluster
-      - lvm_osds
-      - purge_lvm_osds
-      - docker_cluster_collocation
-      - update_docker_cluster
       - switch_to_containers
-      - shrink_mon
-      - shrink_mon_container
-      - shrink_osd
-      - shrink_osd_container
-      - bluestore_osds_non_container
-      - bluestore_osds_container
-      - filestore_osds_non_container
-      - filestore_osds_container
-      - purge_cluster_container
-      - purge_cluster_non_container
-      - purge_filestore_osds_container
-      - purge_filestore_osds_non_container
-      - purge_bluestore_osds_container
-      - purge_bluestore_osds_non_container
+    ceph_ansible_branch:
+      - stable-3.1
+    jobs:
+        - 'ceph-ansible-nightly-{release}-{distribution}-{deployment}-{ceph_ansible_branch}-{scenario}'
+
+- project:
+    name: ceph-ansible-nightly-ooo-stable3.1
+    release:
+      - jewel
+      - luminous
+    distribution:
+      - centos
+      - ubuntu
+    deployment:
+      - non_container
+    scenario:
       - ooo_collocation
     ceph_ansible_branch:
       - stable-3.1
@@ -132,30 +98,45 @@
       - shrink_osd
       - lvm_batch
       - add_osds
+      - add_mons
       - rgw_multisite
       - purge
+      - lvm_auto_discovery
     ceph_ansible_branch:
       - stable-3.2
     jobs:
         - 'ceph-ansible-nightly-{release}-{distribution}-{deployment}-{ceph_ansible_branch}-{scenario}'
 
 - project:
-    name: ceph-ansible-nightly-stable3.2_container_only
+    name: ceph-ansible-nightly-stable3.2_ooo
     release:
       - luminous
     distribution:
       - centos
-      - ubuntu
     deployment:
       - container
     scenario:
-      - switch_to_containers
       - ooo_collocation
     ceph_ansible_branch:
       - stable-3.2
     jobs:
         - 'ceph-ansible-nightly-{release}-{distribution}-{deployment}-{ceph_ansible_branch}-{scenario}'
 
+- project:
+    name: ceph-ansible-nightly-stable3.2_non_container
+    release:
+      - luminous
+    distribution:
+      - centos
+    deployment:
+      - non_container
+    scenario:
+      - switch_to_containers
+    ceph_ansible_branch:
+      - stable-3.2
+    jobs:
+        - 'ceph-ansible-nightly-{release}-{distribution}-{deployment}-{ceph_ansible_branch}-{scenario}'
+
 - job-template:
     name: 'ceph-ansible-nightly-{release}-{distribution}-{deployment}-{ceph_ansible_branch}-{scenario}'
     node: vagrant&&libvirt&&centos7

diff --git a/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml b/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml
index eed0c2788080f20b98e3b20638bcbdad8cb41b79..ed0a788571b684094dfce34fc06cf5157576b7b0 100644 (file)
--- a/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml
+++ b/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml
@@ -1,10 +1,9 @@
-# new jobs definitions for ceph-ansible scenario refact (see: https://github.com/ceph/ceph-ansible/pull/3364)
+# master
 - project:
-    name: ceph-ansible-prs-pipeline
+    name: ceph-ansible-prs-master-pipeline
     slave_labels: 'vagrant && libvirt && smithi'
     release:
       - dev
-      - luminous
     distribution:
       - centos
       - rhel
@@ -27,12 +26,141 @@
       - rgw_multisite
       - purge
       - lvm_auto_discovery
-      - podman
+    jobs:
+        - 'ceph-ansible-prs-pipeline'
+
+- project:
+    name: ceph-ansible-prs-master-non_container-pipeline
+    slave_labels: 'vagrant && libvirt && smithi'
+    release:
+      - dev
+    distribution:
+      - centos
+      - ubuntu
+    deployment:
+      - non_container
+    scenario:
       - switch_to_containers
+    jobs:
+        - 'ceph-ansible-prs-pipeline'
+
+- project:
+    name: ceph-ansible-prs-master-ooo-pipeline
+    slave_labels: 'vagrant && libvirt && smithi'
+    release:
+      - dev
+    distribution:
+      - centos
+    deployment:
+      - container
+    scenario:
+      - ooo_collocation
+    jobs:
+        - 'ceph-ansible-prs-pipeline'
+
+- project:
+    name: ceph-ansible-prs-master-podman-pipeline
+    slave_labels: 'vagrant && libvirt && smithi'
+    release:
+      - dev
+    distribution:
+      - rhel
+    deployment:
+      - container
+    scenario:
+      - podman
+    jobs:
+        - 'ceph-ansible-prs-pipeline'
+
+# luminous, stable-3.2, stable 3.1
+- project:
+    name: ceph-ansible-prs-luminous-pipeline
+    slave_labels: 'vagrant && libvirt && smithi'
+    release:
+      - luminous
+    distribution:
+      - centos
+      - ubuntu
+    deployment:
+      - container
+      - non_container
+    scenario:
+# stable-3.2 / stable-3.1
+      - all_daemons
+      - collocation
+      - update
+      - bluestore_lvm_osds
+      - lvm_osds
+      - shrink_mon
+      - shrink_osd
+      - lvm_batch
+      - add_osds
+      - rgw_multisite
+      - purge
+# stable-3.1
+      - filestore_osds
+      - purge_filestore
+      - bluestore_osds
+      - purge_bluestore
+    jobs:
+        - 'ceph-ansible-prs-pipeline'
+
+- project:
+    name: ceph-ansible-prs-stable-ooo-pipeline
+    slave_labels: 'vagrant && libvirt && smithi'
+    release:
+      - jewel
+      - luminous
+    distribution:
+      - centos
+    deployment:
+      - container
+    scenario:
       - ooo_collocation
     jobs:
         - 'ceph-ansible-prs-pipeline'
 
+- project:
+    name: ceph-ansible-prs-stable-non_container-pipeline
+    slave_labels: 'vagrant && libvirt && smithi'
+    release:
+      - jewel
+      - luminous
+    distribution:
+      - centos
+      - ubuntu
+    deployment:
+      - non_container
+    scenario:
+      - switch_to_containers
+    jobs:
+        - 'ceph-ansible-prs-pipeline'
+
+# jewel
+- project:
+    name: ceph-ansible-prs-jewel-pipeline
+    slave_labels: 'vagrant && libvirt && smithi'
+    release:
+      - jewel
+    distribution:
+      - centos
+      - ubuntu
+    deployment:
+      - container
+      - non_container
+    scenario:
+      - all_daemons
+      - cluster
+      - filestore_osds
+      - collocation
+      - update
+      - shrink_mon
+      - shrink_osd
+      - purge
+      - purge_filestore
+    jobs:
+        - 'ceph-ansible-prs-pipeline'
+
 - job-template:
     name: 'ceph-ansible-prs-{release}-{distribution}-{deployment}-{scenario}'
     id: 'ceph-ansible-prs-pipeline'