From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Sun, 4 Oct 2020 08:22:34 +0000 (+0200)
Subject: ceph-ansible: remove ooo_collocation
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=3e24729e458615571c1600e8d794471d9c11bebf;p=ceph-build.git

ceph-ansible: remove ooo_collocation

This job is not needed anymore, we already have 'collocation' for that.

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 535b64bf..324f1f6c 100644
--- a/ceph-ansible-nightly/config/definitions/ceph-ansible-nightly.yml
+++ b/ceph-ansible-nightly/config/definitions/ceph-ansible-nightly.yml
@@ -18,15 +18,12 @@
       - add_osds
       - rgw_multisite
       - purge
-      - ooo_collocation
       - switch_to_containers
     ceph_ansible_branch:
       - stable-3.2
     jobs:
         - 'ceph-ansible-nightly-{release}-{distribution}-{deployment}-{ceph_ansible_branch}-{scenario}'
     exclude:
-      - deployment: non_container
-        scenario: ooo_collocation
       - deployment: container
         scenario: switch_to_containers
 
@@ -52,15 +49,12 @@
       - rgw_multisite
       - purge
       - lvm_auto_discovery
-      - ooo_collocation
       - switch_to_containers
     ceph_ansible_branch:
       - stable-4.0
     jobs:
         - 'ceph-ansible-nightly-{release}-{distribution}-{deployment}-{ceph_ansible_branch}-{scenario}'
     exclude:
-      - deployment: non_container
-        scenario: ooo_collocation
       - deployment: container
         scenario: switch_to_containers
 
@@ -86,15 +80,12 @@
       - rgw_multisite
       - purge
       - lvm_auto_discovery
-      - ooo_collocation
       - switch_to_containers
     ceph_ansible_branch:
       - stable-5.0
     jobs:
         - 'ceph-ansible-nightly-{release}-{distribution}-{deployment}-{ceph_ansible_branch}-{scenario}'
     exclude:
-      - deployment: non_container
-        scenario: ooo_collocation
       - deployment: container
         scenario: switch_to_containers
 
diff --git a/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml b/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml
index 7d6225bc..a359cabc 100644
--- a/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml
+++ b/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml
@@ -14,8 +14,6 @@
     exclude:
       - deployment: container
         scenario: switch_to_containers
-      - deployment: non_container
-        scenario: ooo_collocation
       - deployment: non_container
         scenario: podman
     jobs:
@@ -35,10 +33,6 @@
       - lvm_batch
       - all_in_one
       - external_clients
-      - ooo_collocation
-    exclude:
-      - deployment: non_container
-        scenario: ooo_collocation
     jobs:
       - 'ceph-ansible-prs-auto'