qa: remove obsolete snap upgrade tests

Direct upgrades from Luminous to Octopus are not supported. These snap format
upgrade tests are now only going to be run in the mimic/nautilus branches.

Fixes: http://tracker.ceph.com/issues/39020
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>

diff --git a/qa/suites/fs/upgrade/snaps/% b/qa/suites/fs/upgrade/snaps/%
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/qa/suites/fs/upgrade/snaps/.qa b/qa/suites/fs/upgrade/snaps/.qa
deleted file mode 120000 (symlink)
index a602a03..0000000
--- a/qa/suites/fs/upgrade/snaps/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file

diff --git a/qa/suites/fs/upgrade/snaps/clusters/.qa b/qa/suites/fs/upgrade/snaps/clusters/.qa
deleted file mode 120000 (symlink)
index a602a03..0000000
--- a/qa/suites/fs/upgrade/snaps/clusters/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file

diff --git a/qa/suites/fs/upgrade/snaps/clusters/3-mds.yaml b/qa/suites/fs/upgrade/snaps/clusters/3-mds.yaml
deleted file mode 120000 (symlink)
index d7ec418..0000000
--- a/qa/suites/fs/upgrade/snaps/clusters/3-mds.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/clusters/3-mds.yaml
\ No newline at end of file

diff --git a/qa/suites/fs/upgrade/snaps/conf b/qa/suites/fs/upgrade/snaps/conf
deleted file mode 120000 (symlink)
index 16e8cc4..0000000
--- a/qa/suites/fs/upgrade/snaps/conf
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/conf
\ No newline at end of file

diff --git a/qa/suites/fs/upgrade/snaps/objectstore-ec b/qa/suites/fs/upgrade/snaps/objectstore-ec
deleted file mode 120000 (symlink)
index affe294..0000000
--- a/qa/suites/fs/upgrade/snaps/objectstore-ec
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/objectstore-ec
\ No newline at end of file

diff --git a/qa/suites/fs/upgrade/snaps/overrides/% b/qa/suites/fs/upgrade/snaps/overrides/%
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/qa/suites/fs/upgrade/snaps/overrides/.qa b/qa/suites/fs/upgrade/snaps/overrides/.qa
deleted file mode 120000 (symlink)
index a602a03..0000000
--- a/qa/suites/fs/upgrade/snaps/overrides/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file

diff --git a/qa/suites/fs/upgrade/snaps/overrides/frag_enable.yaml b/qa/suites/fs/upgrade/snaps/overrides/frag_enable.yaml
deleted file mode 120000 (symlink)
index 34a39a3..0000000
--- a/qa/suites/fs/upgrade/snaps/overrides/frag_enable.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/overrides/frag_enable.yaml
\ No newline at end of file

diff --git a/qa/suites/fs/upgrade/snaps/overrides/multimds/.qa b/qa/suites/fs/upgrade/snaps/overrides/multimds/.qa
deleted file mode 120000 (symlink)
index a602a03..0000000
--- a/qa/suites/fs/upgrade/snaps/overrides/multimds/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file

diff --git a/qa/suites/fs/upgrade/snaps/overrides/multimds/no.yaml b/qa/suites/fs/upgrade/snaps/overrides/multimds/no.yaml
deleted file mode 100644 (file)
index c740a45..0000000
--- a/qa/suites/fs/upgrade/snaps/overrides/multimds/no.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-overrides:
-  ceph:
-    max_mds: 1

diff --git a/qa/suites/fs/upgrade/snaps/overrides/multimds/yes.yaml b/qa/suites/fs/upgrade/snaps/overrides/multimds/yes.yaml
deleted file mode 100644 (file)
index ecf118d..0000000
--- a/qa/suites/fs/upgrade/snaps/overrides/multimds/yes.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-overrides:
-  ceph:
-    max_mds: 2

diff --git a/qa/suites/fs/upgrade/snaps/overrides/whitelist_health.yaml b/qa/suites/fs/upgrade/snaps/overrides/whitelist_health.yaml
deleted file mode 120000 (symlink)
index 74f39a4..0000000
--- a/qa/suites/fs/upgrade/snaps/overrides/whitelist_health.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/overrides/whitelist_health.yaml
\ No newline at end of file

diff --git a/qa/suites/fs/upgrade/snaps/overrides/whitelist_rstat.yaml b/qa/suites/fs/upgrade/snaps/overrides/whitelist_rstat.yaml
deleted file mode 100644 (file)
index 434b5dd..0000000
--- a/qa/suites/fs/upgrade/snaps/overrides/whitelist_rstat.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-overrides:
-  ceph:
-    log-whitelist:
-      - inconsistent rstat on inode
-    conf:
-      mds:
-        mds debug scatterstat: 0
-        mds verify scatter: 0

diff --git a/qa/suites/fs/upgrade/snaps/overrides/whitelist_wrongly_marked_down.yaml b/qa/suites/fs/upgrade/snaps/overrides/whitelist_wrongly_marked_down.yaml
deleted file mode 120000 (symlink)
index b4528c0..0000000
--- a/qa/suites/fs/upgrade/snaps/overrides/whitelist_wrongly_marked_down.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/overrides/whitelist_wrongly_marked_down.yaml
\ No newline at end of file

diff --git a/qa/suites/fs/upgrade/snaps/tasks/% b/qa/suites/fs/upgrade/snaps/tasks/%
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/qa/suites/fs/upgrade/snaps/tasks/.qa b/qa/suites/fs/upgrade/snaps/tasks/.qa
deleted file mode 120000 (symlink)
index a602a03..0000000
--- a/qa/suites/fs/upgrade/snaps/tasks/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file

diff --git a/qa/suites/fs/upgrade/snaps/tasks/0-luminous.yaml b/qa/suites/fs/upgrade/snaps/tasks/0-luminous.yaml
deleted file mode 100644 (file)
index 7835cbf..0000000
--- a/qa/suites/fs/upgrade/snaps/tasks/0-luminous.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-meta:
-- desc: |
-   install ceph/luminous latest
-tasks:
-- install:
-    branch: luminous
-    exclude_packages:
-      - librados3
-      - ceph-mgr-dashboard
-      - ceph-mgr-diskprediction-local
-      - ceph-mgr-diskprediction-cloud
-      - ceph-mgr-rook
-      - ceph-mgr-ssh
-    extra_packages: ['librados2']
-- print: "**** done installing luminous"
-- ceph:
-    mon_bind_addrvec: false
-    mon_bind_msgr2: false
-    log-whitelist:
-      - overall HEALTH_
-      - \(FS_
-      - \(MDS_
-      - \(OSD_
-      - \(MON_DOWN\)
-      - \(CACHE_POOL_
-      - \(POOL_
-      - \(MGR_DOWN\)
-      - \(PG_
-      - \(SMALLER_PGP_NUM\)
-      - Monitor daemon marked osd
-      - Behind on trimming
-      - Manager daemon
-    conf:
-      global:
-        mon warn on pool no app: false
-        ms bind msgr2: false
-- exec:
-    osd.0:
-      - ceph osd require-osd-release luminous
-      - ceph osd set-require-min-compat-client luminous
-- print: "**** done ceph"

diff --git a/qa/suites/fs/upgrade/snaps/tasks/1-client.yaml b/qa/suites/fs/upgrade/snaps/tasks/1-client.yaml
deleted file mode 100644 (file)
index 0aa6dcf..0000000
--- a/qa/suites/fs/upgrade/snaps/tasks/1-client.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-tasks:
-- ceph-fuse:
-- print: "**** done luminous client"
-- exec:
-    mon.a:
-    - ceph fs set cephfs allow_new_snaps true --yes-i-really-mean-it
-- workunit:
-    timeout: 5m
-    cleanup: false
-    clients:
-      client.0:
-      - fs/snap-hierarchy.sh
-- print: "**** done snap hierarchy"

diff --git a/qa/suites/fs/upgrade/snaps/tasks/2-upgrade.yaml b/qa/suites/fs/upgrade/snaps/tasks/2-upgrade.yaml
deleted file mode 100644 (file)
index 5c50d60..0000000
--- a/qa/suites/fs/upgrade/snaps/tasks/2-upgrade.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-tasks:
-- mds_pre_upgrade:
-- print: "**** done mds pre-upgrade sequence"
-- install.upgrade:
-    mon.a:
-    mon.b:
-- print: "**** done install.upgrade both hosts"
-- ceph.stop: [mds.*]
-- ceph.restart:
-    daemons: [mon.*, mgr.*, osd.*, mds.*]
-    mon-health-to-clog: false
-- print: "**** done ceph.restart"

diff --git a/qa/suites/fs/upgrade/snaps/tasks/3-sanity.yaml b/qa/suites/fs/upgrade/snaps/tasks/3-sanity.yaml
deleted file mode 100644 (file)
index d93dc3b..0000000
--- a/qa/suites/fs/upgrade/snaps/tasks/3-sanity.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-tasks:
-- exec:
-    mon.a:
-    - ceph status
-    - ceph fs dump --format=json-pretty
-    - ceph fs set cephfs max_mds 2 && exit 1 || true
-- print: "**** confirmed cannot set max_mds=2"
-- exec:
-    mon.a:
-    - ceph fs set cephfs allow_new_snaps true

diff --git a/qa/suites/fs/upgrade/snaps/tasks/4-client-upgrade/.qa b/qa/suites/fs/upgrade/snaps/tasks/4-client-upgrade/.qa
deleted file mode 120000 (symlink)
index a602a03..0000000
--- a/qa/suites/fs/upgrade/snaps/tasks/4-client-upgrade/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file

diff --git a/qa/suites/fs/upgrade/snaps/tasks/4-client-upgrade/no.yaml b/qa/suites/fs/upgrade/snaps/tasks/4-client-upgrade/no.yaml
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/qa/suites/fs/upgrade/snaps/tasks/4-client-upgrade/yes.yaml b/qa/suites/fs/upgrade/snaps/tasks/4-client-upgrade/yes.yaml
deleted file mode 100644 (file)
index 13b590e..0000000
--- a/qa/suites/fs/upgrade/snaps/tasks/4-client-upgrade/yes.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-tasks:
-- install.upgrade:
-    client.0:
-- print: "**** done install.upgrade on client.0"
-- ceph-fuse:
-    client.0:
-      mounted: false
-- ceph-fuse:
-    client.0:
-- print: "**** done remount client"

diff --git a/qa/suites/fs/upgrade/snaps/tasks/5-client-sanity.yaml b/qa/suites/fs/upgrade/snaps/tasks/5-client-sanity.yaml
deleted file mode 100644 (file)
index 680e440..0000000
--- a/qa/suites/fs/upgrade/snaps/tasks/5-client-sanity.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-tasks:
-- workunit:
-    timeout: 5m
-    cleanup: false
-    env:
-      VERIFY: verify
-    clients:
-      client.0:
-      - fs/snap-hierarchy.sh
-- print: "**** done verify snap hierarchy"

diff --git a/qa/suites/fs/upgrade/snaps/tasks/6-snap-upgrade.yaml b/qa/suites/fs/upgrade/snaps/tasks/6-snap-upgrade.yaml
deleted file mode 100644 (file)
index fe0b17e..0000000
--- a/qa/suites/fs/upgrade/snaps/tasks/6-snap-upgrade.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-overrides:
-  ceph:
-    log-whitelist:
-      - bad backtrace on inode
-tasks:
-- cephfs_upgrade_snap:
-- print: "**** upgraded snapshot metadata"
-- exec:
-    mon.a:
-    - ceph fs set cephfs max_mds 2
-- print: "**** increased max_mds=2"
-- sleep:
-    duration: 10
-- exec:
-    mon.a:
-    - ceph fs dump | grep '^max_mds.*2'

diff --git a/qa/suites/fs/upgrade/snaps/tasks/7-client-sanity.yaml b/qa/suites/fs/upgrade/snaps/tasks/7-client-sanity.yaml
deleted file mode 120000 (symlink)
index 4ad65e4..0000000
--- a/qa/suites/fs/upgrade/snaps/tasks/7-client-sanity.yaml
+++ /dev/null
@@ -1 +0,0 @@
-5-client-sanity.yaml
\ No newline at end of file