From 44399645b421726b919ec116a679653780f3d545 Mon Sep 17 00:00:00 2001
From: Dimitri Savineau <dsavinea@redhat.com>
Date: Fri, 19 Mar 2021 11:28:16 -0400
Subject: [PATCH] ceph-volume-nightly: remove luminous

Mimic was already removed and Luminous is EOL so no need to keep jobs
for this release.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
---
 ceph-volume-nightly/build/build               |  6 +---
 .../definitions/ceph-volume-nightly.yml       | 29 -------------------
 2 files changed, 1 insertion(+), 34 deletions(-)

diff --git a/ceph-volume-nightly/build/build b/ceph-volume-nightly/build/build
index 2d3ed473..f4f05480 100644
--- a/ceph-volume-nightly/build/build
+++ b/ceph-volume-nightly/build/build
@@ -14,11 +14,7 @@ update_vagrant_boxes
 
 cd src/ceph-volume/ceph_volume/tests/functional/$SUBCOMMAND
 
-if [ "$CEPH_BRANCH" = "mimic" ]; then
-    CEPH_ANSIBLE_BRANCH="stable-3.2"
-elif [ "$CEPH_BRANCH" = "luminous" ]; then
-    CEPH_ANSIBLE_BRANCH="stable-3.2"
-elif [ "$CEPH_BRANCH" = "nautilus" ]; then
+if [ "$CEPH_BRANCH" = "nautilus" ]; then
     CEPH_ANSIBLE_BRANCH="stable-4.0"
 else
     CEPH_ANSIBLE_BRANCH="master"
diff --git a/ceph-volume-nightly/config/definitions/ceph-volume-nightly.yml b/ceph-volume-nightly/config/definitions/ceph-volume-nightly.yml
index a96e7a14..8513e9ae 100644
--- a/ceph-volume-nightly/config/definitions/ceph-volume-nightly.yml
+++ b/ceph-volume-nightly/config/definitions/ceph-volume-nightly.yml
@@ -14,7 +14,6 @@
       - lvm
     ceph_branch:
       - master
-      - luminous
       - nautilus
     exclude:
       - ceph_branch: master
@@ -25,28 +24,6 @@
         distro: xenial
       - ceph_branch: nautilus
         distro: xenial
-      - ceph_branch: luminous
-        distro: centos8
-
-    jobs:
-      - 'ceph-volume-nightly-{ceph_branch}-{subcommand}-{distro}-{objectstore}-{scenario}'
-
-- project:
-    name: ceph-volume-nightly-simple
-    distro:
-      - xenial
-      - centos7
-    objectstore:
-      - bluestore
-      - filestore
-    scenario:
-      - activate
-      - dmcrypt_luks
-      - dmcrypt_plain
-    subcommand:
-      - simple
-    ceph_branch:
-      - luminous
 
     jobs:
       - 'ceph-volume-nightly-{ceph_branch}-{subcommand}-{distro}-{objectstore}-{scenario}'
@@ -67,7 +44,6 @@
       - batch
     ceph_branch:
       - master
-      - luminous
       - nautilus
     exclude:
       - ceph_branch: master
@@ -78,8 +54,6 @@
         distro: xenial
       - ceph_branch: nautilus
         distro: xenial
-      - ceph_branch: luminous
-        distro: centos8
 
     jobs:
       - 'ceph-volume-nightly-{ceph_branch}-{subcommand}-{distro}-{objectstore}-{scenario}'
@@ -102,7 +76,6 @@
     ceph_branch:
       - master
       - nautilus
-      - luminous
     exclude:
       - ceph_branch: master
         distro: centos7
@@ -112,8 +85,6 @@
         distro: xenial
       - ceph_branch: nautilus
         distro: xenial
-      - ceph_branch: luminous
-        distro: centos8
 
     jobs:
       - 'ceph-volume-nightly-{ceph_branch}-{subcommand}-{distro}-{objectstore}-{scenario}'
-- 
2.39.5