ceph-ansible: add nautilus testing

since nautilus / stable-4.0 have been released upstream, let's add
nautilus testing in the CI.

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 526966587dfe74fccdebc94356b787ad14f3a8b5..0c8cb56fa911cc52c900d48228a22ca225548e1f 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,6 @@
 - project:
     name: ceph-ansible-nightly-stable3.1
     release:
-      - jewel
       - luminous
     distribution:
       - centos
@@ -47,7 +46,6 @@
 - project:
     name: ceph-ansible-nightly-non_container-stable3.1
     release:
-      - jewel
       - luminous
     distribution:
       - centos
@@ -64,7 +62,6 @@
 - project:
     name: ceph-ansible-nightly-ooo-stable3.1
     release:
-      - jewel
       - luminous
     distribution:
       - centos
@@ -136,6 +133,64 @@
     jobs:
         - 'ceph-ansible-nightly-{release}-{distribution}-{deployment}-{ceph_ansible_branch}-{scenario}'
 
+- project:
+    name: ceph-ansible-nightly-stable4.0
+    release:
+      - nautilus
+    distribution:
+      - centos
+      - ubuntu
+    deployment:
+      - container
+      - non_container
+    scenario:
+      - all_daemons
+      - collocation
+      - update
+      - bluestore_lvm_osds
+      - lvm_osds
+      - shrink_mon
+      - shrink_osd
+      - lvm_batch
+      - add_osds
+      - rgw_multisite
+      - purge
+      - lvm_auto_discovery
+    ceph_ansible_branch:
+      - stable-4.0
+    jobs:
+        - 'ceph-ansible-nightly-{release}-{distribution}-{deployment}-{ceph_ansible_branch}-{scenario}'
+
+- project:
+    name: ceph-ansible-nightly-stable4.0_ooo
+    release:
+      - nautilus
+    distribution:
+      - centos
+    deployment:
+      - container
+    scenario:
+      - ooo_collocation
+    ceph_ansible_branch:
+      - stable-4.0
+    jobs:
+        - 'ceph-ansible-nightly-{release}-{distribution}-{deployment}-{ceph_ansible_branch}-{scenario}'
+
+- project:
+    name: ceph-ansible-nightly-stable4.0_non_container
+    release:
+      - nautilus
+    distribution:
+      - centos
+    deployment:
+      - non_container
+    scenario:
+      - switch_to_containers
+    ceph_ansible_branch:
+      - stable-4.0
+    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-pipeline/config/definitions/ceph-ansible-pipeline.yml b/ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml
index c7e9580ff22310abaffcc30771ad801b804c34b4..80c7de6ead5a113ca45a0263d0c4085284951e27 100644 (file)
--- a/ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml
+++ b/ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml
@@ -122,6 +122,76 @@
                     current-parameters: true
                   - name: 'ceph-ansible-prs-dev-centos-container-lvm_auto_discovery'
                     current-parameters: true
+      - conditional-step:
+          condition-kind: shell
+          condition-command: |
+            # if the target branch is not master then we DON'T RUN these tests.
+            if [[ "$ghprbTargetBranch" != "stable-4.0" ]]; then
+              exit 1
+            fi
+          on-evaluation-failure: dont-run
+          steps:
+            - multijob:
+                name: 'ceph-ansible cluster first testing phase'
+                condition: SUCCESSFUL
+                execution-type: PARALLEL
+                projects:
+                  - name: 'ceph-ansible-prs-nautilus-centos-non_container-all_daemons'
+                    current-parameters: true
+                  - name: 'ceph-ansible-prs-nautilus-centos-container-all_daemons'
+                    current-parameters: true
+                  - name: 'ceph-ansible-prs-nautilus-centos-non_container-lvm_osds'
+                    current-parameters: true
+                  - name: 'ceph-ansible-prs-nautilus-centos-container-lvm_osds'
+                    current-parameters: true
+                  - name: 'ceph-ansible-prs-nautilus-ubuntu-non_container-all_daemons'
+                    current-parameters: true
+                  - name: 'ceph-ansible-prs-nautilus-ubuntu-container-all_daemons'
+                    current-parameters: true
+                  - name: 'ceph-ansible-prs-nautilus-rhel-container-podman'
+                    current-parameters: true
+            - multijob:
+                name: 'ceph-ansible cluster second testing phase'
+                condition: SUCCESSFUL
+                execution-type: PARALLEL
+                projects:
+                  - name: 'ceph-ansible-prs-nautilus-centos-non_container-purge'
+                    current-parameters: true
+                  - name: 'ceph-ansible-prs-nautilus-ubuntu-non_container-purge'
+                    current-parameters: true
+                  - name: 'ceph-ansible-prs-nautilus-centos-container-purge'
+                    current-parameters: true
+                  - name: 'ceph-ansible-prs-nautilus-ubuntu-container-purge'
+                    current-parameters: true
+                  - name: 'ceph-ansible-prs-nautilus-centos-non_container-switch_to_containers'
+                    current-parameters: true
+                  - name: 'ceph-ansible-prs-nautilus-centos-non_container-update'
+                    current-parameters: true
+                  - name: 'ceph-ansible-prs-nautilus-centos-container-update'
+                    current-parameters: true
+                  - name: 'ceph-ansible-prs-nautilus-centos-non_container-storage_inventory'
+                    current-parameters: true
+                  - name: 'ceph-ansible-prs-nautilus-centos-container-storage_inventory'
+                    current-parameters: true
+            - multijob:
+                name: 'ceph-ansible cluster third testing phase'
+                condition: SUCCESSFUL
+                execution-type: PARALLEL
+                projects:
+                  - name: 'ceph-ansible-prs-nautilus-centos-container-collocation'
+                    current-parameters: true
+                  - name: 'ceph-ansible-prs-nautilus-centos-non_container-bluestore_lvm_osds'
+                    current-parameters: true
+                  - name: 'ceph-ansible-prs-nautilus-centos-container-bluestore_lvm_osds'
+                    current-parameters: true
+                  - name: 'ceph-ansible-prs-nautilus-centos-non_container-lvm_batch'
+                    current-parameters: true
+                  - name: 'ceph-ansible-prs-nautilus-centos-container-lvm_batch'
+                    current-parameters: true
+                  - name: 'ceph-ansible-prs-nautilus-centos-non_container-lvm_auto_discovery'
+                    current-parameters: true
+                  - name: 'ceph-ansible-prs-nautilus-centos-container-lvm_auto_discovery'
+                    current-parameters: true
       - conditional-step:
           condition-kind: shell
           condition-command: |

diff --git a/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml b/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml
index 6fd3864dfd8207be664865bf7db2699e16be23bb..e876c86a0a35adc7a61f01720108d5b5de2779af 100644 (file)
--- a/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml
+++ b/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml
@@ -6,7 +6,6 @@
       - dev
     distribution:
       - centos
-      - rhel
       - ubuntu
     deployment:
       - container
@@ -73,12 +72,12 @@
     jobs:
         - 'ceph-ansible-prs-pipeline'
 
-# luminous, stable-3.2, stable 3.1
+# nautilus
 - project:
-    name: ceph-ansible-prs-luminous-pipeline
+    name: ceph-ansible-prs-nautilus-pipeline
     slave_labels: 'vagrant && libvirt && smithi'
     release:
-      - luminous
+      - nautilus
     distribution:
       - centos
       - ubuntu
@@ -86,8 +85,8 @@
       - container
       - non_container
     scenario:
-# stable-3.2 / stable-3.1
       - all_daemons
+      - cluster
       - collocation
       - update
       - bluestore_lvm_osds
@@ -96,22 +95,34 @@
       - shrink_osd
       - lvm_batch
       - add_osds
+      - add_mons
+      - add_mdss
       - rgw_multisite
       - purge
-# stable-3.1
-      - filestore_osds
-      - purge_filestore
-      - bluestore_osds
-      - purge_bluestore
+      - lvm_auto_discovery
     jobs:
         - 'ceph-ansible-prs-pipeline'
 
 - project:
-    name: ceph-ansible-prs-stable-ooo-pipeline
+    name: ceph-ansible-prs-nautilus-non_container-pipeline
     slave_labels: 'vagrant && libvirt && smithi'
     release:
-      - jewel
-      - luminous
+      - nautilus
+    distribution:
+      - centos
+      - ubuntu
+    deployment:
+      - non_container
+    scenario:
+      - switch_to_containers
+    jobs:
+        - 'ceph-ansible-prs-pipeline'
+
+- project:
+    name: ceph-ansible-prs-nautilus-ooo-pipeline
+    slave_labels: 'vagrant && libvirt && smithi'
+    release:
+      - nautilus
     distribution:
       - centos
     deployment:
@@ -122,27 +133,25 @@
         - 'ceph-ansible-prs-pipeline'
 
 - project:
-    name: ceph-ansible-prs-stable-non_container-pipeline
+    name: ceph-ansible-prs-nautilus-podman-pipeline
     slave_labels: 'vagrant && libvirt && smithi'
     release:
-      - jewel
-      - luminous
+      - nautilus
     distribution:
-      - centos
-      - ubuntu
+      - rhel
     deployment:
-      - non_container
+      - container
     scenario:
-      - switch_to_containers
+      - podman
     jobs:
         - 'ceph-ansible-prs-pipeline'
 
-# jewel
+# luminous, stable-3.2, stable 3.1
 - project:
-    name: ceph-ansible-prs-jewel-pipeline
+    name: ceph-ansible-prs-luminous-pipeline
     slave_labels: 'vagrant && libvirt && smithi'
     release:
-      - jewel
+      - luminous
     distribution:
       - centos
       - ubuntu
@@ -150,15 +159,52 @@
       - container
       - non_container
     scenario:
+# stable-3.2 / stable-3.1
       - all_daemons
-      - cluster
-      - filestore_osds
       - 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:
+      - 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:
+      - luminous
+    distribution:
+      - centos
+      - ubuntu
+    deployment:
+      - non_container
+    scenario:
+      - switch_to_containers
     jobs:
         - 'ceph-ansible-prs-pipeline'