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

tests: rgw/singleton: drop duplicate filestore-xfs.yaml #15959

Merged
merged 1 commit into from Jun 30, 2017

Conversation

Projects
None yet
3 participants
@smithfarm
Contributor

smithfarm commented Jun 27, 2017

qa/suites/rgw/singleton/filestore-xfs.yaml is duplicated by qa/suites/rgw/singleton/objectstore/filestore-xfs.yaml - drop the former.

tests: rgw/singleton: drop duplicate filestore-xfs.yaml
This yaml is now included in the objectstore/ directory. It makes no sense to
duplicate it here.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
@smithfarm

This comment has been minimized.

Contributor

smithfarm commented Jun 27, 2017

Content looks exactly the same:

smithfarm@wilbur:~/src/ceph/SUSE/ceph/qa/suites/rgw/singleton> cat filestore-xfs.yaml
overrides:
  ceph:
    fs: xfs
    conf:
      osd:
        osd objectstore: filestore
        osd sloppy crc: true
smithfarm@wilbur:~/src/ceph/SUSE/ceph/qa/suites/rgw/singleton> cat objectstore/filestore-xfs.yaml
overrides:
  ceph:
    fs: xfs
    conf:
      osd:
        osd objectstore: filestore
        osd sloppy crc: true
@cbodley

This comment has been minimized.

Contributor

cbodley commented Jun 28, 2017

because of singleton/%, the singleton/filestore-xfs.yaml is getting included in the generated yaml of all singleton jobs, in addition to the yaml selected under singleton/objectstore/. i thought this might have been intended to override singleton/objectstore/, but it doesn't look like that's happening

see http://qa-proxy.ceph.com/teuthology/yuriw-2017-06-27_23:53:03-rgw-wip-yuri-testing_2017_6_28-distro-basic-smithi/1334711/teuthology.log as an example:

description: rgw/singleton/{all/radosgw-admin.yaml filestore-xfs.yaml frontend/civetweb.yaml objectstore/bluestore-comp.yaml overrides.yaml rgw_pool_type/ec-cache.yaml}

...

osd objectstore: bluestore

so i agree that this extra singleton/filestore-xfs.yaml has no material effect 👍

@cbodley cbodley added the needs-qa label Jun 28, 2017

@liewegas liewegas merged commit 1025d7a into ceph:master Jun 30, 2017

4 checks passed

Signed-off-by all commits in this PR are signed
Details
Unmodified Submodules submodules for project are unmodified
Details
default Build finished.
Details
make check make check succeeded
Details

@smithfarm smithfarm deleted the smithfarm:wip-rgw-singleton-cleanup branch Jun 30, 2017

@smithfarm

This comment has been minimized.

Contributor

smithfarm commented Jun 30, 2017

Thanks, though I don't think the rados suite covers this PR, which is touching the rgw suite yaml.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment