qa/cephadm: move mds_upgrade_sequence test start point from reef -> tentacle

Since main is what will become umbrella we no longer need
to test reef as a starting point but do need to test tentacle

Signed-off-by: Adam King <adking@redhat.com>

diff --git a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/reef/$ b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/reef/$
deleted file mode 100644 (file)
index e69de29..0000000

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

diff --git a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/reef/reef.yaml b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/reef/reef.yaml
deleted file mode 100644 (file)
index 75b0c5d..0000000
--- a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/reef/reef.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-meta:
-- desc: |
-   setup ceph/reef
-
-tasks:
-- install:
-    branch: reef
-    exclude_packages:
-      - ceph-volume
-      - ceph-osd-classic
-      - ceph-osd-crimson
-- print: "**** done install task..."
-- cephadm:
-    image: quay.ceph.io/ceph-ci/ceph:reef
-    roleless: true
-    compiled_cephadm_branch: reef
-    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 reef cephadm ..."
-- cephadm.shell:
-    host.a:
-      - ceph config set mgr mgr/cephadm/use_repo_digest true --force
-- print: "**** done cephadm.shell ceph config set mgr..."
-- cephadm.shell:
-    host.a:
-      - ceph orch status
-      - ceph orch ps
-      - ceph orch ls
-      - ceph orch host ls
-      - ceph orch device ls

diff --git a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/reef/v18.2.0.yaml b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/reef/v18.2.0.yaml
deleted file mode 100644 (file)
index b0ea9db..0000000
--- a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/reef/v18.2.0.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-meta:
-- desc: |
-   setup ceph/v18.2.0
-
-tasks:
-- install:
-    tag: v18.2.0
-    exclude_packages:
-      - ceph-volume
-      - ceph-osd-classic
-      - ceph-osd-crimson
-- print: "**** done install task..."
-- cephadm:
-    image: quay.io/ceph/ceph:v18.2.0
-    roleless: true
-    compiled_cephadm_branch: reef
-    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 v18.2.0 cephadm ..."
-- cephadm.shell:
-    host.a:
-      - ceph config set mgr mgr/cephadm/use_repo_digest true --force
-- print: "**** done cephadm.shell ceph config set mgr..."
-- cephadm.shell:
-    host.a:
-      - ceph orch status
-      - ceph orch ps
-      - ceph orch ls
-      - ceph orch host ls
-      - ceph orch device ls

diff --git a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/reef/v18.2.1.yaml b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/reef/v18.2.1.yaml
deleted file mode 100644 (file)
index b2c66dd..0000000
--- a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/reef/v18.2.1.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-meta:
-- desc: |
-   setup ceph/v18.2.1
-
-tasks:
-- install:
-    tag: v18.2.1
-    exclude_packages:
-      - ceph-volume
-      - ceph-osd-classic
-      - ceph-osd-crimson
-- print: "**** done install task..."
-- cephadm:
-    image: quay.io/ceph/ceph:v18.2.1
-    roleless: true
-    compiled_cephadm_branch: reef
-    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 v18.2.1 cephadm ..."
-- cephadm.shell:
-    host.a:
-      - ceph config set mgr mgr/cephadm/use_repo_digest true --force
-- print: "**** done cephadm.shell ceph config set mgr..."
-- cephadm.shell:
-    host.a:
-      - ceph orch status
-      - ceph orch ps
-      - ceph orch ls
-      - ceph orch host ls
-      - ceph orch device ls

diff --git a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/tentacle.yaml b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/tentacle.yaml
new file mode 100644 (file)
index 0000000..fcae622
--- /dev/null
+++ b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/tentacle.yaml
@@ -0,0 +1,33 @@
+meta:
+- desc: |
+   setup ceph/tentacle
+
+tasks:
+- install:
+    branch: tentacle
+    exclude_packages:
+      - ceph-volume
+      - ceph-osd-classic
+      - ceph-osd-crimson
+- print: "**** done install task..."
+- cephadm:
+    image: quay.ceph.io/ceph-ci/ceph:tentacle
+    roleless: true
+    compiled_cephadm_branch: tentacle
+    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 tentacle cephadm ..."
+- cephadm.shell:
+    host.a:
+      - ceph config set mgr mgr/cephadm/use_repo_digest true --force
+- print: "**** done cephadm.shell ceph config set mgr..."
+- cephadm.shell:
+    host.a:
+      - ceph orch status
+      - ceph orch ps
+      - ceph orch ls
+      - ceph orch host ls
+      - ceph orch device ls