From: Sage Weil Date: Fri, 20 Dec 2019 16:13:40 +0000 (-0600) Subject: qa/suites/rados/thrash-old-clients: use cephadm X-Git-Tag: v15.1.0~390^2~11 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1c7bd1d1f987716e8801d9a3848ffacccbdb1a46;p=ceph.git 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 --- 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 6cf32608d6b..295b4c47834 100644 --- 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 2ba6d4c098b..11f4e38a0ce 100644 --- 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 40856c1b5c0..51d281fda83 100644 --- 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 0238fd19906..804eebe1c06 100644 --- 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 64004bde350..3262ccd4f70 100644 --- 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 e7e2961ce88..e120331fe9f 100644 --- 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 dae4276cd72..b3765d050db 100644 --- 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 3ef5ec0366b..9d487c906d4 100644 --- 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 4077e07d01b..982cf6302f4 100644 --- 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 ed38c9c9003..17bf637725f 100644 --- 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 5df450dc956..42f9495a851 100644 --- 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 35cfc3c1ff6..9af5382ea23 100644 --- 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 index 00000000000..f406338aa74 --- /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