Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

hammer: tests: update rbd/singleton/all/formatted-output.yaml to support ceph-ci #12824

Merged
merged 4 commits into from Jan 21, 2017

Conversation

smithfarm
Copy link
Contributor

@smithfarm smithfarm commented Jan 8, 2017

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

Note that ed0e8be was not cherry-picked because it changes a file that doesn't exist in hammer.

vshankar and others added 4 commits January 8, 2017 19:45
Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit d2f0d74)

Conflicts:
	suites/krbd/unmap/tasks/unmap.yaml (hammer doesn't have this)
	suites/rbd/singleton/all/formatted-output.yaml (moved to qa/,
            trivial resolution)
Inspired by bcbe45d

Fixes: http://tracker.ceph.com/issues/18440
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 56e37e4)
References: http://tracker.ceph.com/issues/18440
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 74689df)
References: http://tracker.ceph.com/issues/18440
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 2484a55)

Conflicts: (hammer doesn't have these files)
	qa/suites/rbd/maintenance/qemu/xfstests.yaml
	qa/suites/rbd/qemu/workloads/#qemu_xfstests.yaml#
@smithfarm smithfarm self-assigned this Jan 8, 2017
@smithfarm smithfarm added this to the hammer milestone Jan 8, 2017
@smithfarm smithfarm merged commit 9036fee into ceph:hammer Jan 21, 2017
@smithfarm smithfarm deleted the wip-18449-hammer branch January 21, 2017 09:00
@smithfarm
Copy link
Contributor Author

This passed an rbd suite at http://tracker.ceph.com/issues/17151#note-49

@smithfarm smithfarm changed the title hammer: [teuthology] update rbd/singleton/all/formatted-output.yaml to support ceph-ci hammer: tests: update rbd/singleton/all/formatted-output.yaml to support ceph-ci Jan 27, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants