From 85fe26fde9082c4d90f69f96fcdbbf8c2dc13818 Mon Sep 17 00:00:00 2001
From: Adam King <adking@redhat.com>
Date: Tue, 8 Aug 2023 12:33:48 -0400
Subject: [PATCH] qa/fs/upgrade: update mds_upgrade_sequence test starting
 version

Now that reef has been released, on main we
only need to test upgrades starting from quincy
and upgrades from pacific are no longer valid

Signed-off-by: Adam King <adking@redhat.com>
---
 .../0-from/{pacific.yaml => quincy.yaml}      | 10 +++---
 .../tasks/0-from/v16.2.4.yaml                 | 34 -------------------
 2 files changed, 5 insertions(+), 39 deletions(-)
 rename qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/{pacific.yaml => quincy.yaml} (79%)
 delete mode 100644 qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/v16.2.4.yaml

diff --git a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/pacific.yaml b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/quincy.yaml
similarity index 79%
rename from qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/pacific.yaml
rename to qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/quincy.yaml
index 6432d708055e2..4a21021c0e843 100644
--- a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/pacific.yaml
+++ b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/quincy.yaml
@@ -1,24 +1,24 @@
 meta:
 - desc: |
-   setup ceph/pacific
+   setup ceph/quincy
 
 tasks:
 - install:
-    branch: pacific
+    branch: quincy
     exclude_packages:
       - ceph-volume
 - print: "**** done install task..."
 - cephadm:
-    image: quay.ceph.io/ceph-ci/ceph:pacific
+    image: quay.ceph.io/ceph-ci/ceph:quincy
     roleless: true
-    cephadm_branch: pacific
+    cephadm_branch: quincy
     cephadm_git_url: https://github.com/ceph/ceph
     conf:
       osd:
         #set config option for which cls modules are allowed to be loaded / used
         osd_class_load_list: "*"
         osd_class_default_list: "*"
-- print: "**** done end installing pacific cephadm ..."
+- print: "**** done end installing quincy cephadm ..."
 - cephadm.shell:
     host.a:
       - ceph config set mgr mgr/cephadm/use_repo_digest true --force
diff --git a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/v16.2.4.yaml b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/v16.2.4.yaml
deleted file mode 100644
index 36bfb1b91be6a..0000000000000
--- a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/v16.2.4.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-teuthology:
-  postmerge:
-    - if yaml.teuthology.variables.fail_fs then reject() end
-
-meta:
-- desc: |
-   setup ceph/pacific v16.2.4
-
-tasks:
-# Disable metrics sending by kclient as it may crash (assert) a v16.2.4 MDS
-- pexec:
-    clients:
-      - sudo modprobe -r ceph
-      - sudo modprobe ceph disable_send_metrics=on
-- install:
-    tag: v16.2.4
-    exclude_packages:
-      - ceph-volume
-- print: "**** done install task..."
-- cephadm:
-    roleless: true
-    image: quay.io/ceph/ceph:v16.2.4
-    cephadm_branch: v16.2.4
-    cephadm_git_url: https://github.com/ceph/ceph
-    # needed for v16.2.4 due to --skip-admin-label
-    avoid_pacific_features: true
-- print: "**** done starting v16.2.4"
-- cephadm.shell:
-    host.a:
-      - ceph orch status
-      - ceph orch ps
-      - ceph orch ls
-      - ceph orch host ls
-      - ceph orch device ls
-- 
2.39.5