From c4f6031fc68e87ad4492d5a46772aedcc0d51dbe Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Thu, 12 Apr 2018 16:54:54 -0400 Subject: [PATCH] qa/rgw: remove rgw/upgrade suite Signed-off-by: Casey Bodley --- qa/suites/rgw/upgrade/ragweed/% | 0 .../rgw/upgrade/ragweed/kraken-x/0-cluster/+ | 0 .../ragweed/kraken-x/0-cluster/openstack.yaml | 6 ----- .../ragweed/kraken-x/0-cluster/start.yaml | 25 ------------------- .../ragweed/kraken-x/1-install/basever.yaml | 9 ------- .../ragweed/kraken-x/2-workload/prepare.yaml | 8 ------ .../ragweed/kraken-x/3-upgrade/upgrade.yaml | 24 ------------------ .../ragweed/kraken-x/4-workload/check.yaml | 8 ------ 8 files changed, 80 deletions(-) delete mode 100644 qa/suites/rgw/upgrade/ragweed/% delete mode 100644 qa/suites/rgw/upgrade/ragweed/kraken-x/0-cluster/+ delete mode 100644 qa/suites/rgw/upgrade/ragweed/kraken-x/0-cluster/openstack.yaml delete mode 100644 qa/suites/rgw/upgrade/ragweed/kraken-x/0-cluster/start.yaml delete mode 100644 qa/suites/rgw/upgrade/ragweed/kraken-x/1-install/basever.yaml delete mode 100644 qa/suites/rgw/upgrade/ragweed/kraken-x/2-workload/prepare.yaml delete mode 100644 qa/suites/rgw/upgrade/ragweed/kraken-x/3-upgrade/upgrade.yaml delete mode 100644 qa/suites/rgw/upgrade/ragweed/kraken-x/4-workload/check.yaml diff --git a/qa/suites/rgw/upgrade/ragweed/% b/qa/suites/rgw/upgrade/ragweed/% deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/qa/suites/rgw/upgrade/ragweed/kraken-x/0-cluster/+ b/qa/suites/rgw/upgrade/ragweed/kraken-x/0-cluster/+ deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/qa/suites/rgw/upgrade/ragweed/kraken-x/0-cluster/openstack.yaml b/qa/suites/rgw/upgrade/ragweed/kraken-x/0-cluster/openstack.yaml deleted file mode 100644 index a0d5c20195b..00000000000 --- a/qa/suites/rgw/upgrade/ragweed/kraken-x/0-cluster/openstack.yaml +++ /dev/null @@ -1,6 +0,0 @@ -openstack: - - machine: - disk: 100 # GB - - volumes: # attached to each instance - count: 3 - size: 30 # GB diff --git a/qa/suites/rgw/upgrade/ragweed/kraken-x/0-cluster/start.yaml b/qa/suites/rgw/upgrade/ragweed/kraken-x/0-cluster/start.yaml deleted file mode 100644 index 2b61069026d..00000000000 --- a/qa/suites/rgw/upgrade/ragweed/kraken-x/0-cluster/start.yaml +++ /dev/null @@ -1,25 +0,0 @@ -meta: -- desc: | - Run ceph on two nodes, - with a separate client-only node. - Use xfs beneath the osds. -overrides: - ceph: - conf: - mon: - mon warn on legacy crush tunables: false - fs: xfs - log-whitelist: - - wrongly marked me down -roles: -- - mon.a - - mon.b - - mon.c - - mds.a - - osd.0 - - osd.1 - - osd.2 -- - osd.3 - - osd.4 - - osd.5 -- - client.0 diff --git a/qa/suites/rgw/upgrade/ragweed/kraken-x/1-install/basever.yaml b/qa/suites/rgw/upgrade/ragweed/kraken-x/1-install/basever.yaml deleted file mode 100644 index 56f24b20baf..00000000000 --- a/qa/suites/rgw/upgrade/ragweed/kraken-x/1-install/basever.yaml +++ /dev/null @@ -1,9 +0,0 @@ -meta: -- desc: install ceph/ latest -tasks: -- install: - branch: kraken - exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev'] -- print: "**** done install base branch" -- ceph: -- print: "**** done ceph" diff --git a/qa/suites/rgw/upgrade/ragweed/kraken-x/2-workload/prepare.yaml b/qa/suites/rgw/upgrade/ragweed/kraken-x/2-workload/prepare.yaml deleted file mode 100644 index 964b2f87e77..00000000000 --- a/qa/suites/rgw/upgrade/ragweed/kraken-x/2-workload/prepare.yaml +++ /dev/null @@ -1,8 +0,0 @@ -tasks: -- rgw: - - client.0 -- ragweed: - client.0: - force-branch: ceph-master - rgw_server: client.0 - stages: prepare diff --git a/qa/suites/rgw/upgrade/ragweed/kraken-x/3-upgrade/upgrade.yaml b/qa/suites/rgw/upgrade/ragweed/kraken-x/3-upgrade/upgrade.yaml deleted file mode 100644 index e7a23ca847e..00000000000 --- a/qa/suites/rgw/upgrade/ragweed/kraken-x/3-upgrade/upgrade.yaml +++ /dev/null @@ -1,24 +0,0 @@ -tasks: -- install.upgrade: - mon.a: - mon.b: - mon.c: - osd.0: - osd.1: - osd.2: - osd.3: - osd.4: - osd.5: - client.0: -- ceph.restart: - daemons: [mon.a, mon.b, mon.c] - wait-for-healthy: false - wait-for-osds-up: false -- ceph.restart: - daemons: [osd.0, osd.1, osd.2] - wait-for-healthy: false - wait-for-osds-up: true -- ceph.restart: - daemons: [osd.3, osd.4, osd.5] - wait-for-healthy: false - wait-for-osds-up: true diff --git a/qa/suites/rgw/upgrade/ragweed/kraken-x/4-workload/check.yaml b/qa/suites/rgw/upgrade/ragweed/kraken-x/4-workload/check.yaml deleted file mode 100644 index 2d056bde4a3..00000000000 --- a/qa/suites/rgw/upgrade/ragweed/kraken-x/4-workload/check.yaml +++ /dev/null @@ -1,8 +0,0 @@ -tasks: -- rgw: - - client.0 -- ragweed: - client.0: - force-branch: ceph-master - rgw_server: client.0 - stages: check -- 2.39.5