From 1dfe9e514d57b223e853ddabe33712a1523aeba5 Mon Sep 17 00:00:00 2001
From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Thu, 15 Sep 2022 09:23:32 +0200
Subject: [PATCH] ceph-volume-nightly: cleanup

update ceph-volume nightly jobs.
drop nautilus testing as it's EOL for a while.
drop testing against el7
drop testing against xenial (replace with focal)
test against quincy and pacific

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

diff --git a/ceph-volume-nightly/config/definitions/ceph-volume-nightly.yml b/ceph-volume-nightly/config/definitions/ceph-volume-nightly.yml
index fb8ade16..4e879b24 100644
--- a/ceph-volume-nightly/config/definitions/ceph-volume-nightly.yml
+++ b/ceph-volume-nightly/config/definitions/ceph-volume-nightly.yml
@@ -1,8 +1,7 @@
 - project:
     name: ceph-volume-nightly-lvm
     distro:
-      - xenial
-      - centos7
+      - focal
       - centos8
     objectstore:
       - bluestore
@@ -14,16 +13,8 @@
       - lvm
     ceph_branch:
       - main
-      - nautilus
-    exclude:
-      - ceph_branch: main
-        distro: centos7
-      - ceph_branch: nautilus
-        distro: centos8
-      - ceph_branch: main
-        distro: xenial
-      - ceph_branch: nautilus
-        distro: xenial
+      - quincy
+      - pacific
 
     jobs:
       - 'ceph-volume-nightly-{ceph_branch}-{subcommand}-{distro}-{objectstore}-{scenario}'
@@ -31,8 +22,7 @@
 - project:
     name: ceph-volume-nightly-batch
     distro:
-      - xenial
-      - centos7
+      - focal
       - centos8
     objectstore:
       - bluestore
@@ -44,16 +34,8 @@
       - batch
     ceph_branch:
       - main
-      - nautilus
-    exclude:
-      - ceph_branch: main
-        distro: centos7
-      - ceph_branch: nautilus
-        distro: centos8
-      - ceph_branch: main
-        distro: xenial
-      - ceph_branch: nautilus
-        distro: xenial
+      - quincy
+      - pacific
 
     jobs:
       - 'ceph-volume-nightly-{ceph_branch}-{subcommand}-{distro}-{objectstore}-{scenario}'
@@ -61,7 +43,7 @@
 - project:
     name: ceph-volume-nightly-batch-mixed
     distro:
-      - centos7
+      - focal
       - centos8
     objectstore:
       - bluestore
@@ -75,16 +57,8 @@
       - batch
     ceph_branch:
       - main
-      - nautilus
-    exclude:
-      - ceph_branch: main
-        distro: centos7
-      - ceph_branch: nautilus
-        distro: centos8
-      - ceph_branch: main
-        distro: xenial
-      - ceph_branch: nautilus
-        distro: xenial
+      - quincy
+      - pacific
 
     jobs:
       - 'ceph-volume-nightly-{ceph_branch}-{subcommand}-{distro}-{objectstore}-{scenario}'
-- 
2.39.5