From: Sage Weil <sage@redhat.com>
Date: Tue, 8 Nov 2016 17:06:43 +0000 (-0500)
Subject: rados/singleton-nomsgr: drop hammer, infernalis upgrades
X-Git-Tag: v11.1.1~58^2^2~51^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=660a2edaa2bea8597e7eccca31fb6c6aaf2d4501;p=ceph.git

rados/singleton-nomsgr: drop hammer, infernalis upgrades

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

diff --git a/suites/rados/singleton-nomsgr/all/lfn-upgrade-hammer.yaml b/suites/rados/singleton-nomsgr/all/lfn-upgrade-hammer.yaml
deleted file mode 100644
index 204efb03e0f..00000000000
--- a/suites/rados/singleton-nomsgr/all/lfn-upgrade-hammer.yaml
+++ /dev/null
@@ -1,97 +0,0 @@
-os_type: ubuntu
-overrides:
-  ceph:
-    conf:
-      mon:
-        debug mon: 20
-        debug ms: 1
-        debug paxos: 20
-        mon warn on legacy crush tunables: false
-        mon min osdmap epochs: 3
-      osd:
-        osd map cache size: 2
-        osd map max advance: 1
-        debug filestore: 20
-        debug journal: 20
-        debug ms: 1
-        debug osd: 20
-    log-whitelist:
-    - osd_map_cache_size
-    - slow request
-    - scrub mismatch
-    - ScrubResult
-    - failed to encode
-    - wrongly marked me down
-roles:
-- - mon.a
-  - osd.0
-  - osd.1
-  - mon.b
-  - mon.c
-  - osd.2
-  - client.0
-openstack:
-  - volumes: # attached to each instance
-      count: 3
-      size: 10 # GB
-tasks:
-- install:
-    branch: hammer
-- print: '**** done installing hammer'
-- ceph:
-    fs: xfs
-- print: '**** done ceph'
-- ceph_manager.create_pool:
-    args: ['test']
-    kwargs:
-      pg_num: 1
-- sleep:
-    duration: 10
-- ceph_manager.wait_for_clean: null
-- create_verify_lfn_objects:
-    pool: 'test'
-    prefix: 'hammer-x'
-    namespace:
-    - 'long_namespace__________________________________________________'
-    - ''
-    - 'namespace'
-    num_objects: 5
-    name_length: [400, 800, 1600]
-- sequential:
-  - create_verify_lfn_objects:
-      pool: 'test'
-      prefix: 'hammer-mixed'
-      namespace:
-      - 'long_namespace__________________________________________________'
-      - ''
-      - 'namespace'
-      num_objects: 5
-      name_length: [400, 800, 1600]
-  - install.upgrade:
-      mon.a: null
-  - ceph.restart:
-      daemons: [mon.a, mon.b, mon.c]
-      wait-for-healthy: false
-  - exec:
-      mon.a:
-        - ceph osd set require_kraken_osds
-  - ceph.restart:
-      daemons: [osd.0, osd.1]
-  - ceph_manager.wait_for_clean: null
-  - ceph_manager.do_pg_scrub:
-      args: ['test', 0, 'scrub']
-- ceph_manager.do_pg_scrub:
-    args: ['test', 0, 'scrub']
-- create_verify_lfn_objects:
-    pool: 'test'
-    prefix: 'mixed-x'
-    namespace:
-    - 'long_namespace__________________________________________________'
-    - ''
-    - 'namespace'
-    num_objects: 5
-    name_length: [400, 800, 1600]
-- ceph.restart: [osd.2]
-- ceph_manager.wait_for_clean: null
-- ceph_manager.do_pg_scrub:
-    args: ['test', 0, 'scrub']
diff --git a/suites/rados/singleton-nomsgr/all/lfn-upgrade-infernalis.yaml b/suites/rados/singleton-nomsgr/all/lfn-upgrade-infernalis.yaml
deleted file mode 100644
index 406a213baf2..00000000000
--- a/suites/rados/singleton-nomsgr/all/lfn-upgrade-infernalis.yaml
+++ /dev/null
@@ -1,100 +0,0 @@
-os_type: ubuntu
-overrides:
-  ceph:
-    conf:
-      mon:
-        debug mon: 20
-        debug ms: 1
-        debug paxos: 20
-        mon warn on legacy crush tunables: false
-        mon min osdmap epochs: 3
-      osd:
-        osd map cache size: 2
-        osd map max advance: 1
-        debug filestore: 20
-        debug journal: 20
-        debug ms: 1
-        debug osd: 20
-    log-whitelist:
-    - osd_map_cache_size
-    - slow request
-    - scrub mismatch
-    - ScrubResult
-    - failed to encode
-    - wrongly marked me down
-roles:
-- - mon.a
-  - osd.0
-  - osd.1
-  - mon.b
-  - mon.c
-  - osd.2
-  - client.0
-openstack:
-  - volumes: # attached to each instance
-      count: 3
-      size: 10 # GB
-tasks:
-- install:
-    branch: infernalis
-- print: '**** done installing infernalis'
-- ceph:
-    fs: xfs
-- print: '**** done ceph'
-- ceph_manager.create_pool:
-    args: ['test']
-    kwargs:
-      pg_num: 1
-- sleep:
-    duration: 10
-- ceph_manager.wait_for_clean: null
-- create_verify_lfn_objects:
-    pool: 'test'
-    prefix: 'infernalis-x'
-    namespace:
-    - 'long_namespace__________________________________________________'
-    - ''
-    - 'namespace'
-    num_objects: 5
-    name_length: [400, 800, 1600]
-- sequential:
-  - create_verify_lfn_objects:
-      pool: 'test'
-      prefix: 'infernalis-mixed'
-      namespace:
-      - 'long_namespace__________________________________________________'
-      - ''
-      - 'namespace'
-      num_objects: 5
-      name_length: [400, 800, 1600]
-  - install.upgrade:
-      mon.a: null
-  - ceph.restart:
-      daemons: [mon.a, mon.b, mon.c]
-      wait-for-healthy: false
-  - exec:
-      mon.a:
-        - ceph osd set require_kraken_osds
-  - ceph.restart:
-      daemons: [osd.0, osd.1]
-  - exec:
-      mon.a:
-        - ceph osd set require_kraken_osds
-  - ceph_manager.wait_for_clean: null
-  - ceph_manager.do_pg_scrub:
-      args: ['test', 0, 'scrub']
-- ceph_manager.do_pg_scrub:
-    args: ['test', 0, 'scrub']
-- create_verify_lfn_objects:
-    pool: 'test'
-    prefix: 'mixed-x'
-    namespace:
-    - 'long_namespace__________________________________________________'
-    - ''
-    - 'namespace'
-    num_objects: 5
-    name_length: [400, 800, 1600]
-- ceph.restart: [osd.2]
-- ceph_manager.wait_for_clean: null
-- ceph_manager.do_pg_scrub:
-    args: ['test', 0, 'scrub']