qa/suites/rados/thrash-old-clients: use cephadm

- deploy cluster with cephadm so we can run a octopus+ cluster and also
  install client packages that are ancient.
- move client.2 back onto the third node, since packages no longer
  conflict.
- test on centos 7.x (i picked 6), since the old releases all built on
  that release.

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/qa/suites/rados/thrash-old-clients/1-install/hammer.yaml b/qa/suites/rados/thrash-old-clients/1-install/hammer.yaml
index 6cf32608d6b4447aca25d844bcfcd7a05affe010..295b4c47834f01a83a6b9ba7250e39f5e31e9759 100644 (file)
--- a/qa/suites/rados/thrash-old-clients/1-install/hammer.yaml
+++ b/qa/suites/rados/thrash-old-clients/1-install/hammer.yaml
@@ -28,7 +28,3 @@ tasks:
       - libcephfs-dev
       - libradospp-devel
     extra_packages: ['librados2']
-- install.upgrade:
-    mon.a:
-    mon.b:
-    mon.c:

diff --git a/qa/suites/rados/thrash-old-clients/1-install/jewel-v1only.yaml b/qa/suites/rados/thrash-old-clients/1-install/jewel-v1only.yaml
index 2ba6d4c098bca5fba6805bc0e1d3cb5f7e026c28..11f4e38a0ce7268373300b2411c3a53773b65d12 100644 (file)
--- a/qa/suites/rados/thrash-old-clients/1-install/jewel-v1only.yaml
+++ b/qa/suites/rados/thrash-old-clients/1-install/jewel-v1only.yaml
@@ -24,7 +24,3 @@ tasks:
       - libcephfs-devel
       - libcephfs-dev
     extra_packages: ['librados2']
-- install.upgrade:
-    mon.a:
-    mon.b:
-    mon.c:

diff --git a/qa/suites/rados/thrash-old-clients/1-install/jewel.yaml b/qa/suites/rados/thrash-old-clients/1-install/jewel.yaml
index 40856c1b5c02eed301f1d06126a07a3277fcc2b7..51d281fda83221687c001e1b1347b0263beaed67 100644 (file)
--- a/qa/suites/rados/thrash-old-clients/1-install/jewel.yaml
+++ b/qa/suites/rados/thrash-old-clients/1-install/jewel.yaml
@@ -23,7 +23,3 @@ tasks:
       - libcephfs-devel
       - libcephfs-dev
     extra_packages: ['librados2']
-- install.upgrade:
-    mon.a:
-    mon.b:
-    mon.c:

diff --git a/qa/suites/rados/thrash-old-clients/1-install/luminous-v1only.yaml b/qa/suites/rados/thrash-old-clients/1-install/luminous-v1only.yaml
index 0238fd199063238e538dcd1eb9f5f94022e14d60..804eebe1c068c2bb36afdc2aa418aca09a23901f 100644 (file)
--- a/qa/suites/rados/thrash-old-clients/1-install/luminous-v1only.yaml
+++ b/qa/suites/rados/thrash-old-clients/1-install/luminous-v1only.yaml
@@ -20,7 +20,3 @@ tasks:
       - ceph-mgr-cephadm
       - cephadm
     extra_packages: ['librados2']
-- install.upgrade:
-    mon.a:
-    mon.b:
-    mon.c:

diff --git a/qa/suites/rados/thrash-old-clients/1-install/luminous.yaml b/qa/suites/rados/thrash-old-clients/1-install/luminous.yaml
index 64004bde350c57a850e00c79a76c29ca5fcd7b3f..3262ccd4f7036f9676aac5c76f27ce927ffdb72c 100644 (file)
--- a/qa/suites/rados/thrash-old-clients/1-install/luminous.yaml
+++ b/qa/suites/rados/thrash-old-clients/1-install/luminous.yaml
@@ -19,7 +19,3 @@ tasks:
       - ceph-mgr-cephadm
       - cephadm
     extra_packages: ['librados2']
-- install.upgrade:
-    mon.a:
-    mon.b:
-    mon.c:

diff --git a/qa/suites/rados/thrash-old-clients/1-install/mimic-v1only.yaml b/qa/suites/rados/thrash-old-clients/1-install/mimic-v1only.yaml
index e7e2961ce8874475db5f8eb48b58b07338f74cca..e120331fe9f0fd03c74dcf5a6aa4d31fddb66b7b 100644 (file)
--- a/qa/suites/rados/thrash-old-clients/1-install/mimic-v1only.yaml
+++ b/qa/suites/rados/thrash-old-clients/1-install/mimic-v1only.yaml
@@ -20,7 +20,3 @@ tasks:
       - ceph-mgr-cephadm
       - cephadm
     extra_packages: ['librados2']
-- install.upgrade:
-    mon.a:
-    mon.b:
-    mon.c:

diff --git a/qa/suites/rados/thrash-old-clients/1-install/mimic.yaml b/qa/suites/rados/thrash-old-clients/1-install/mimic.yaml
index dae4276cd720210a864df0e0d269ff15ceec070c..b3765d050db418c62eadcfe7df697556dea56f7a 100644 (file)
--- a/qa/suites/rados/thrash-old-clients/1-install/mimic.yaml
+++ b/qa/suites/rados/thrash-old-clients/1-install/mimic.yaml
@@ -20,7 +20,3 @@ tasks:
       - ceph-mgr-cephadm
       - cephadm
     extra_packages: ['librados2']
-- install.upgrade:
-    mon.a:
-    mon.b:
-    mon.c:

diff --git a/qa/suites/rados/thrash-old-clients/1-install/nautilus-v1only.yaml b/qa/suites/rados/thrash-old-clients/1-install/nautilus-v1only.yaml
index 3ef5ec0366b39c2900349f00bde6ae515611cf21..9d487c906d450de356a22ce724d11d3f12cbc256 100644 (file)
--- a/qa/suites/rados/thrash-old-clients/1-install/nautilus-v1only.yaml
+++ b/qa/suites/rados/thrash-old-clients/1-install/nautilus-v1only.yaml
@@ -13,7 +13,3 @@ tasks:
     branch: nautilus
     exclude_packages:
       - cephadm
-- install.upgrade:
-    mon.a:
-    mon.b:
-    mon.c:

diff --git a/qa/suites/rados/thrash-old-clients/1-install/nautilus-v2only.yaml b/qa/suites/rados/thrash-old-clients/1-install/nautilus-v2only.yaml
index 4077e07d01b0c34d0747f90ed9ff193527b1527b..982cf6302f4a045369accc03850f14b189707a90 100644 (file)
--- a/qa/suites/rados/thrash-old-clients/1-install/nautilus-v2only.yaml
+++ b/qa/suites/rados/thrash-old-clients/1-install/nautilus-v2only.yaml
@@ -12,7 +12,3 @@ tasks:
     branch: nautilus
     exclude_packages:
       - cephadm
-- install.upgrade:
-    mon.a:
-    mon.b:
-    mon.c:

diff --git a/qa/suites/rados/thrash-old-clients/1-install/nautilus.yaml b/qa/suites/rados/thrash-old-clients/1-install/nautilus.yaml
index ed38c9c9003813379e752d3b9bbea6012fd92011..17bf637725fd22c2354270913f89b071df36fd8e 100644 (file)
--- a/qa/suites/rados/thrash-old-clients/1-install/nautilus.yaml
+++ b/qa/suites/rados/thrash-old-clients/1-install/nautilus.yaml
@@ -7,7 +7,3 @@ tasks:
     branch: nautilus
     exclude_packages:
       - cephadm
-- install.upgrade:
-    mon.a:
-    mon.b:
-    mon.c:

diff --git a/qa/suites/rados/thrash-old-clients/ceph.yaml b/qa/suites/rados/thrash-old-clients/ceph.yaml
index 5df450dc9565b43aa43487c45671a6b2794cecbf..42f9495a851667af64c11da289253bb70bac7e12 100644 (file)
--- a/qa/suites/rados/thrash-old-clients/ceph.yaml
+++ b/qa/suites/rados/thrash-old-clients/ceph.yaml
@@ -1,2 +1,2 @@
 tasks:
-- ceph:
+- cephadm:

diff --git a/qa/suites/rados/thrash-old-clients/clusters/three-plus-one.yaml b/qa/suites/rados/thrash-old-clients/clusters/three-plus-one.yaml
index 35cfc3c1ff6de1a2e5aae7de10c3b798b1530a60..9af5382ea23a380f133ed8998ec15108f8816498 100644 (file)
--- a/qa/suites/rados/thrash-old-clients/clusters/three-plus-one.yaml
+++ b/qa/suites/rados/thrash-old-clients/clusters/three-plus-one.yaml
@@ -1,8 +1,7 @@
 roles:
 - [mon.a, mgr.y, osd.0, osd.1, osd.2, osd.3, client.0]
 - [mon.b, mgr.x, osd.4, osd.5, osd.6, osd.7, client.1]
-- [mon.c, osd.8, osd.9, osd.10, osd.11]
-- [client.2]
+- [mon.c, osd.8, osd.9, osd.10, osd.11, client.2]
 openstack:
 - volumes: # attached to each instance
     count: 4

diff --git a/qa/suites/rados/thrash-old-clients/distro$/centos_7.6.yaml b/qa/suites/rados/thrash-old-clients/distro$/centos_7.6.yaml
new file mode 120000 (symlink)
index 0000000..f406338
--- /dev/null
+++ b/qa/suites/rados/thrash-old-clients/distro$/centos_7.6.yaml
@@ -0,0 +1 @@
+.qa/distros/all/centos_7.6.yaml
\ No newline at end of file