Removed point-to-point-x test, will need to add jewel specoific later

http://tracker.ceph.com/issues/14339

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>

diff --git a/suites/upgrade/hammer-x/point-to-point-x/% b/suites/upgrade/hammer-x/point-to-point-x/%
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/suites/upgrade/hammer-x/point-to-point-x/0-tz-eastern.yaml b/suites/upgrade/hammer-x/point-to-point-x/0-tz-eastern.yaml
deleted file mode 120000 (symlink)
index f7ee09f..0000000
--- a/suites/upgrade/hammer-x/point-to-point-x/0-tz-eastern.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../timezone/eastern.yaml
\ No newline at end of file

diff --git a/suites/upgrade/hammer-x/point-to-point-x/point-to-point.yaml b/suites/upgrade/hammer-x/point-to-point-x/point-to-point.yaml
deleted file mode 100644 (file)
index a029f40..0000000
--- a/suites/upgrade/hammer-x/point-to-point-x/point-to-point.yaml
+++ /dev/null
@@ -1,252 +0,0 @@
-overrides:
-  ceph:
-    log-whitelist:
-    - reached quota
-    - scrub
-    - osd_map_max_advance
-    - failed to encode
-    - wrongly marked
-    fs: xfs
-    conf:
-      mon:
-        mon debug unsafe allow tier with nonempty snaps: true
-      osd:
-        osd map max advance: 1000
-roles:
-- - mon.a
-  - mds.a
-  - osd.0
-  - osd.1
-  - osd.2
-- - mon.b
-  - mon.c
-  - osd.3
-  - osd.4
-  - osd.5
-  - client.0
-- - client.1
-tasks:
-- print: "****  v0.94 about to install"
-- install:
-    tag: v0.94
-- print: "**** done v0.94 install"
-- ceph:
-   fs: xfs
-- print: "**** done ceph xfs"
-- sequential:
-   - workload
-- print: "**** done workload v0.94"
-- parallel:
-   - workload1
-   - upgrade-sequence1
-- print: "**** done parallel v0.94.2"
-- parallel:
-   - workload_hammer
-   - upgrade-sequence_hammer
-- print: "**** done parallel hammer branch"
-- install.upgrade:
-   client.1:
-     branch: hammer
-- parallel:
-   - workload_x
-   - upgrade-sequence_x
-- print: "**** done parallel -x branch"
-# Run test.sh on the -x upgraded cluster
-- install.upgrade:
-    client.1:
-- workunit:
-    clients:
-      client.1:
-      - rados/test.sh
-      - cls
-- print: "**** done final test on -x cluster"
-#######################
-workload:
-   sequential:
-   - workunit:
-       clients:
-         client.0:
-           - suites/blogbench.sh
-   - print: "**** done suites/blogbench.sh workload"
-workload1:
-   sequential:
-   - workunit:
-       clients:
-         client.0:
-         - rados/load-gen-big.sh
-   - print: "**** done rados/load-gen-big.sh workload1"
-   - workunit:
-       branch: hammer
-       clients:
-         client.0:
-         - rados/test.sh
-         - cls
-   - print: "**** done rados/test.sh &  cls workload1"
-   - workunit:
-       clients:
-         client.0:
-         - rbd/test_librbd.sh
-   - print: "**** done rbd/test_librbd.sh workload1"
-upgrade-sequence1:
-   sequential:
-   - install.upgrade:
-       mon.a:
-         tag: v0.94.2
-       mon.b:
-         tag: v0.94.2
-       client.1:
-         tag: v0.94.2
-   - print: "**** done v0.94.2 install.upgrade"
-   - ceph.restart: [mon.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.b]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.c]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mds.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [osd.0]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.1]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.2]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.3]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.4]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.5]
-   - sleep:
-       duration: 30
-   - print: "**** done ceph.restart all mon/mds/osd v0.94.2"
-workload_hammer:
-   sequential:
-   - workunit:
-       branch: hammer
-       clients:
-         client.1:
-         - rados/test.sh
-         - cls
-   - print: "**** done rados/test.sh &  cls workload_hammer"
-   - rgw: [client.0]
-   - print: "**** done rgw workload_hammer"
-   - s3tests:
-       client.0:
-         force-branch: hammer
-         rgw_server: client.0
-   - print: "**** done s3tests workload_hammer"
-upgrade-sequence_hammer:
-   sequential:
-   - install.upgrade:
-       mon.a:
-         branch: hammer
-       mon.b:
-         branch: hammer
-       # Note that client.a IS NOT upgraded at this point
-       #client.1:
-         #branch: hammer
-   - print: "**** done branch: hammer install.upgrade"
-   - ceph.restart: [mds.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [osd.0]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.1]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.2]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.3]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.4]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.5]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.b]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.c]
-   - sleep:
-       duration: 60
-   - print: "**** done ceph.restart all hammer branch mds/osd/mon"
-workload_x:
-   sequential:
-   - workunit:
-       branch: hammer
-       clients:
-         client.1:
-         - rados/test-upgrade-v9.0.1.sh
-         - cls
-   - print: "**** done rados/test.sh &  cls workload_x NOT upgraded  client"
-   - workunit:
-       clients:
-         client.0:
-         - rados/test.sh
-         - cls
-   - print: "**** done rados/test.sh &  cls workload_x upgraded client"
-   - rgw: [client.1]
-   - print: "**** done rgw workload_x"
-   - s3tests:
-       client.1:
-         force-branch: hammer
-         rgw_server: client.1
-   - print: "**** done s3tests workload_x"
-upgrade-sequence_x:
-   sequential:
-   - install.upgrade:
-       mon.a:
-         #branch: hammer
-       mon.b:
-         #branch: hammer
-       # Note that client.a IS NOT upgraded here 
-       #client.1:
-         #branch: hammer
-   - print: "**** done branch: -x install.upgrade"
-   - ceph.restart: [mds.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [osd.0]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.1]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.2]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.3]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.4]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.5]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.b]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.c]
-   - sleep:
-       duration: 60
-   - print: "**** done ceph.restart all -x branch mds/osd/mon"

diff --git a/suites/upgrade/hammer-x/point-to-point-x/ubuntu_14.04.yaml b/suites/upgrade/hammer-x/point-to-point-x/ubuntu_14.04.yaml
deleted file mode 120000 (symlink)
index 67b68b7..0000000
--- a/suites/upgrade/hammer-x/point-to-point-x/ubuntu_14.04.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../distros/supported/ubuntu_14.04.yaml
\ No newline at end of file