From: Yuri Weinstein Date: Mon, 21 Nov 2016 17:46:18 +0000 (+0000) Subject: Excluded 'libcephfs2','libcephfs-devel','libcephfs-dev' X-Git-Tag: v11.1.1~58^2^2~35^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3d4c3583787e03c3dcad3790ef2d03e48e43ea20;p=ceph.git Excluded 'libcephfs2','libcephfs-devel','libcephfs-dev' Removed firefly and infernalis paths Removed mds role from hammer (per chat with Jason) Add "fs: xfs" override Signed-off-by: Yuri Weinstein --- diff --git a/suites/upgrade/client-upgrade/firefly-client-x/basic/% b/suites/upgrade/client-upgrade/firefly-client-x/basic/% deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/suites/upgrade/client-upgrade/firefly-client-x/basic/0-cluster/start.yaml b/suites/upgrade/client-upgrade/firefly-client-x/basic/0-cluster/start.yaml deleted file mode 100644 index e2ea18d45c8..00000000000 --- a/suites/upgrade/client-upgrade/firefly-client-x/basic/0-cluster/start.yaml +++ /dev/null @@ -1,18 +0,0 @@ -roles: -- - mon.a - - mds.a - - osd.0 - - osd.1 -- - mon.b - - mon.c - - osd.2 - - osd.3 -- - client.0 -overrides: - ceph: - log-whitelist: - - failed to encode map - conf: - client: - rbd default format: 1 - rbd default features: 1 diff --git a/suites/upgrade/client-upgrade/firefly-client-x/basic/1-install/firefly-client-x.yaml b/suites/upgrade/client-upgrade/firefly-client-x/basic/1-install/firefly-client-x.yaml deleted file mode 100644 index 471412d0d96..00000000000 --- a/suites/upgrade/client-upgrade/firefly-client-x/basic/1-install/firefly-client-x.yaml +++ /dev/null @@ -1,11 +0,0 @@ -tasks: -- install: - branch: firefly - exclude_packages: ['ceph-mgr'] -- print: "**** done install firefly" -- install.upgrade: - exclude_packages: ['ceph-test', 'ceph-test-dbg'] - client.0: -- print: "**** done install.upgrade client.0" -- ceph: -- print: "**** done ceph" diff --git a/suites/upgrade/client-upgrade/firefly-client-x/basic/2-workload/rbd_cli_import_export.yaml b/suites/upgrade/client-upgrade/firefly-client-x/basic/2-workload/rbd_cli_import_export.yaml deleted file mode 100644 index 6d4fd41aff3..00000000000 --- a/suites/upgrade/client-upgrade/firefly-client-x/basic/2-workload/rbd_cli_import_export.yaml +++ /dev/null @@ -1,9 +0,0 @@ -tasks: -- workunit: - branch: firefly - clients: - client.0: - - rbd/import_export.sh - env: - RBD_CREATE_ARGS: --new-format -- print: "**** done rbd/import_export.sh" diff --git a/suites/upgrade/client-upgrade/hammer-client-x/basic/0-cluster/start.yaml b/suites/upgrade/client-upgrade/hammer-client-x/basic/0-cluster/start.yaml index db6f5e2fe99..ea9c37d0dbb 100644 --- a/suites/upgrade/client-upgrade/hammer-client-x/basic/0-cluster/start.yaml +++ b/suites/upgrade/client-upgrade/hammer-client-x/basic/0-cluster/start.yaml @@ -1,6 +1,5 @@ roles: - - mon.a - - mds.a - osd.0 - osd.1 - - mon.b @@ -12,3 +11,4 @@ overrides: ceph: log-whitelist: - failed to encode map + fs: xfs diff --git a/suites/upgrade/client-upgrade/hammer-client-x/basic/1-install/hammer-client-x.yaml b/suites/upgrade/client-upgrade/hammer-client-x/basic/1-install/hammer-client-x.yaml index 4fa180b22a0..ffd41949744 100644 --- a/suites/upgrade/client-upgrade/hammer-client-x/basic/1-install/hammer-client-x.yaml +++ b/suites/upgrade/client-upgrade/hammer-client-x/basic/1-install/hammer-client-x.yaml @@ -1,7 +1,7 @@ tasks: - install: branch: hammer - exclude_packages: ['ceph-mgr'] + exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev'] - print: "**** done install hammer" upgrade_workload: sequential: diff --git a/suites/upgrade/client-upgrade/hammer-client-x/rbd/0-cluster/start.yaml b/suites/upgrade/client-upgrade/hammer-client-x/rbd/0-cluster/start.yaml index 4d92f8005e8..4c9f32493ac 100644 --- a/suites/upgrade/client-upgrade/hammer-client-x/rbd/0-cluster/start.yaml +++ b/suites/upgrade/client-upgrade/hammer-client-x/rbd/0-cluster/start.yaml @@ -11,6 +11,7 @@ overrides: ceph: log-whitelist: - failed to encode map + fs: xfs conf: client: rbd default features: 1 diff --git a/suites/upgrade/client-upgrade/hammer-client-x/rbd/1-install/hammer-client-x.yaml b/suites/upgrade/client-upgrade/hammer-client-x/rbd/1-install/hammer-client-x.yaml index 54195b0507a..c70647bcedb 100644 --- a/suites/upgrade/client-upgrade/hammer-client-x/rbd/1-install/hammer-client-x.yaml +++ b/suites/upgrade/client-upgrade/hammer-client-x/rbd/1-install/hammer-client-x.yaml @@ -1,7 +1,7 @@ tasks: - install: branch: hammer - exclude_packages: ['ceph-mgr'] + exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev'] - print: "**** done install hammer" - install.upgrade: exclude_packages: ['ceph-test', 'ceph-test-dbg'] diff --git a/suites/upgrade/client-upgrade/infernalis-client-x/basic/% b/suites/upgrade/client-upgrade/infernalis-client-x/basic/% deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/suites/upgrade/client-upgrade/infernalis-client-x/basic/0-cluster/start.yaml b/suites/upgrade/client-upgrade/infernalis-client-x/basic/0-cluster/start.yaml deleted file mode 100644 index 8ab0246e107..00000000000 --- a/suites/upgrade/client-upgrade/infernalis-client-x/basic/0-cluster/start.yaml +++ /dev/null @@ -1,12 +0,0 @@ -roles: -- - mon.a - - mon.b - - mon.c - - osd.0 - - osd.1 - - osd.2 -- - client.0 -overrides: - ceph: - log-whitelist: - - failed to encode map diff --git a/suites/upgrade/client-upgrade/infernalis-client-x/basic/1-install/infernalis-client-x.yaml b/suites/upgrade/client-upgrade/infernalis-client-x/basic/1-install/infernalis-client-x.yaml deleted file mode 100644 index 1b71ee20506..00000000000 --- a/suites/upgrade/client-upgrade/infernalis-client-x/basic/1-install/infernalis-client-x.yaml +++ /dev/null @@ -1,11 +0,0 @@ -tasks: -- install: - branch: infernalis - exclude_packages: ['ceph-mgr'] -- print: "**** done install infernalis" -upgrade_workload: - sequential: - - install.upgrade: - exclude_packages: ['ceph-test', 'ceph-test-dbg'] - client.0: - - print: "**** done install.upgrade to -x on client.0" diff --git a/suites/upgrade/client-upgrade/infernalis-client-x/basic/2-workload/rbd_api_tests.yaml b/suites/upgrade/client-upgrade/infernalis-client-x/basic/2-workload/rbd_api_tests.yaml deleted file mode 100644 index 99321c67513..00000000000 --- a/suites/upgrade/client-upgrade/infernalis-client-x/basic/2-workload/rbd_api_tests.yaml +++ /dev/null @@ -1,21 +0,0 @@ -tasks: -- exec: - client.0: - - "cp $(which ceph_test_librbd_api) $TESTDIR/ceph_test_librbd_api" -- sequential: - - upgrade_workload -- ceph: -- print: "**** done ceph" -- exec: - client.0: - - "cp --force $TESTDIR/ceph_test_librbd_api $(which ceph_test_librbd_api)" - - "rm -rf $TESTDIR/ceph_test_librbd_api" -- print: "**** done reverting to hammer ceph_test_librbd_api" -- workunit: - branch: infernalis - clients: - client.0: - - rbd/test_librbd_api.sh - env: - RBD_FEATURES: "13" -- print: "**** done rbd/test_librbd_api.sh" diff --git a/suites/upgrade/client-upgrade/infernalis-client-x/basic/2-workload/rbd_cli_import_export.yaml b/suites/upgrade/client-upgrade/infernalis-client-x/basic/2-workload/rbd_cli_import_export.yaml deleted file mode 100644 index 5adc5ac4042..00000000000 --- a/suites/upgrade/client-upgrade/infernalis-client-x/basic/2-workload/rbd_cli_import_export.yaml +++ /dev/null @@ -1,13 +0,0 @@ -tasks: -- sequential: - - upgrade_workload -- ceph: -- print: "**** done ceph" -- workunit: - branch: infernalis - clients: - client.0: - - rbd/import_export.sh - env: - RBD_CREATE_ARGS: --image-feature layering,exclusive-lock,object-map -- print: "**** done rbd/import_export.sh" diff --git a/suites/upgrade/client-upgrade/infernalis-client-x/rbd/% b/suites/upgrade/client-upgrade/infernalis-client-x/rbd/% deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/suites/upgrade/client-upgrade/infernalis-client-x/rbd/0-cluster/start.yaml b/suites/upgrade/client-upgrade/infernalis-client-x/rbd/0-cluster/start.yaml deleted file mode 100644 index 4d92f8005e8..00000000000 --- a/suites/upgrade/client-upgrade/infernalis-client-x/rbd/0-cluster/start.yaml +++ /dev/null @@ -1,16 +0,0 @@ -roles: -- - mon.a - - mon.b - - mon.c - - osd.0 - - osd.1 - - osd.2 - - client.0 -- - client.1 -overrides: - ceph: - log-whitelist: - - failed to encode map - conf: - client: - rbd default features: 1 diff --git a/suites/upgrade/client-upgrade/infernalis-client-x/rbd/1-install/infernalis-client-x.yaml b/suites/upgrade/client-upgrade/infernalis-client-x/rbd/1-install/infernalis-client-x.yaml deleted file mode 100644 index 9e5daead4bc..00000000000 --- a/suites/upgrade/client-upgrade/infernalis-client-x/rbd/1-install/infernalis-client-x.yaml +++ /dev/null @@ -1,11 +0,0 @@ -tasks: -- install: - branch: infernalis - exclude_packages: ['ceph-mgr'] -- print: "**** done install infernalis" -- install.upgrade: - exclude_packages: ['ceph-test', 'ceph-test-dbg'] - client.1: -- print: "**** done install.upgrade to -x on client.0" -- ceph: -- print: "**** done ceph" diff --git a/suites/upgrade/client-upgrade/infernalis-client-x/rbd/2-workload/rbd_notification_tests.yaml b/suites/upgrade/client-upgrade/infernalis-client-x/rbd/2-workload/rbd_notification_tests.yaml deleted file mode 100644 index f83742f823d..00000000000 --- a/suites/upgrade/client-upgrade/infernalis-client-x/rbd/2-workload/rbd_notification_tests.yaml +++ /dev/null @@ -1,21 +0,0 @@ -tasks: -- workunit: - branch: infernalis - clients: - client.0: - - rbd/notify_master.sh - client.1: - - rbd/notify_slave.sh - env: - RBD_FEATURES: "13" -- print: "**** done rbd: old librbd -> new librbd" -- workunit: - branch: infernalis - clients: - client.0: - - rbd/notify_slave.sh - client.1: - - rbd/notify_master.sh - env: - RBD_FEATURES: "13" -- print: "**** done rbd: new librbd -> old librbd" diff --git a/suites/upgrade/client-upgrade/jewel-client-x/basic/% b/suites/upgrade/client-upgrade/jewel-client-x/basic/% new file mode 100644 index 00000000000..e69de29bb2d diff --git a/suites/upgrade/client-upgrade/jewel-client-x/basic/0-cluster/start.yaml b/suites/upgrade/client-upgrade/jewel-client-x/basic/0-cluster/start.yaml new file mode 100644 index 00000000000..a4cd7548d96 --- /dev/null +++ b/suites/upgrade/client-upgrade/jewel-client-x/basic/0-cluster/start.yaml @@ -0,0 +1,13 @@ +roles: +- - mon.a + - mon.b + - mon.c + - osd.0 + - osd.1 + - osd.2 +- - client.0 +overrides: + ceph: + log-whitelist: + - failed to encode map + fs: xfs diff --git a/suites/upgrade/client-upgrade/jewel-client-x/basic/1-install/jewel-client-x.yaml b/suites/upgrade/client-upgrade/jewel-client-x/basic/1-install/jewel-client-x.yaml new file mode 100644 index 00000000000..87ea402dfa3 --- /dev/null +++ b/suites/upgrade/client-upgrade/jewel-client-x/basic/1-install/jewel-client-x.yaml @@ -0,0 +1,11 @@ +tasks: +- install: + branch: jewel + exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev'] +- print: "**** done install jewel" +upgrade_workload: + sequential: + - install.upgrade: + exclude_packages: ['ceph-test', 'ceph-test-dbg'] + client.0: + - print: "**** done install.upgrade to -x on client.0" diff --git a/suites/upgrade/client-upgrade/jewel-client-x/basic/2-workload/rbd_api_tests.yaml b/suites/upgrade/client-upgrade/jewel-client-x/basic/2-workload/rbd_api_tests.yaml new file mode 100644 index 00000000000..8939f3a805a --- /dev/null +++ b/suites/upgrade/client-upgrade/jewel-client-x/basic/2-workload/rbd_api_tests.yaml @@ -0,0 +1,21 @@ +tasks: +- exec: + client.0: + - "cp $(which ceph_test_librbd_api) $TESTDIR/ceph_test_librbd_api" +- sequential: + - upgrade_workload +- ceph: +- print: "**** done ceph" +- exec: + client.0: + - "cp --force $TESTDIR/ceph_test_librbd_api $(which ceph_test_librbd_api)" + - "rm -rf $TESTDIR/ceph_test_librbd_api" +- print: "**** done reverting to jewel ceph_test_librbd_api" +- workunit: + branch: kraken + clients: + client.0: + - rbd/test_librbd_api.sh + env: + RBD_FEATURES: "13" +- print: "**** done rbd/test_librbd_api.sh" diff --git a/suites/upgrade/client-upgrade/jewel-client-x/basic/2-workload/rbd_cli_import_export.yaml b/suites/upgrade/client-upgrade/jewel-client-x/basic/2-workload/rbd_cli_import_export.yaml new file mode 100644 index 00000000000..545354f52ef --- /dev/null +++ b/suites/upgrade/client-upgrade/jewel-client-x/basic/2-workload/rbd_cli_import_export.yaml @@ -0,0 +1,13 @@ +tasks: +- sequential: + - upgrade_workload +- ceph: +- print: "**** done ceph" +- workunit: + branch: jewel + clients: + client.0: + - rbd/import_export.sh + env: + RBD_CREATE_ARGS: --image-feature layering,exclusive-lock,object-map +- print: "**** done rbd/import_export.sh" diff --git a/suites/upgrade/client-upgrade/jewel-client-x/rbd/% b/suites/upgrade/client-upgrade/jewel-client-x/rbd/% new file mode 100644 index 00000000000..e69de29bb2d diff --git a/suites/upgrade/client-upgrade/jewel-client-x/rbd/0-cluster/start.yaml b/suites/upgrade/client-upgrade/jewel-client-x/rbd/0-cluster/start.yaml new file mode 100644 index 00000000000..7ece9c1cf27 --- /dev/null +++ b/suites/upgrade/client-upgrade/jewel-client-x/rbd/0-cluster/start.yaml @@ -0,0 +1,18 @@ +roles: +- - mon.a + - mon.b + - mon.c + - osd.0 + - osd.1 + - osd.2 + - client.0 +- - client.1 +overrides: + ceph: + log-whitelist: + - failed to encode map + fs: xfs + conf: + client: + rbd default features: 1 + diff --git a/suites/upgrade/client-upgrade/jewel-client-x/rbd/1-install/jewel-client-x.yaml b/suites/upgrade/client-upgrade/jewel-client-x/rbd/1-install/jewel-client-x.yaml new file mode 100644 index 00000000000..4ce73a464f8 --- /dev/null +++ b/suites/upgrade/client-upgrade/jewel-client-x/rbd/1-install/jewel-client-x.yaml @@ -0,0 +1,11 @@ +tasks: +- install: + branch: jewel + exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev'] +- print: "**** done install jewel" +- install.upgrade: + exclude_packages: ['ceph-test', 'ceph-test-dbg'] + client.1: +- print: "**** done install.upgrade to -x on client.0" +- ceph: +- print: "**** done ceph task" diff --git a/suites/upgrade/client-upgrade/jewel-client-x/rbd/2-workload/rbd_notification_tests.yaml b/suites/upgrade/client-upgrade/jewel-client-x/rbd/2-workload/rbd_notification_tests.yaml new file mode 100644 index 00000000000..1fb68220e9d --- /dev/null +++ b/suites/upgrade/client-upgrade/jewel-client-x/rbd/2-workload/rbd_notification_tests.yaml @@ -0,0 +1,21 @@ +tasks: +- workunit: + branch: jewel + clients: + client.0: + - rbd/notify_master.sh + client.1: + - rbd/notify_slave.sh + env: + RBD_FEATURES: "13" +- print: "**** done rbd: old librbd -> new librbd" +- workunit: + branch: jewel + clients: + client.0: + - rbd/notify_slave.sh + client.1: + - rbd/notify_master.sh + env: + RBD_FEATURES: "13" +- print: "**** done rbd: new librbd -> old librbd"