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

luminous: tests: qa/workunits: replace 'realpath' with 'readlink -f' in fsstress.sh #24620

Merged
merged 6 commits into from Oct 21, 2018

Conversation

Projects
None yet
4 participants
@dillaman
Contributor

dillaman commented Oct 16, 2018

@dillaman dillaman changed the base branch from master to luminous Oct 16, 2018

@dillaman

This comment has been minimized.

Contributor

dillaman commented Oct 16, 2018

Note: this PR includes the commits from PR #24430

@smithfarm

This comment has been minimized.

Contributor

smithfarm commented Oct 16, 2018

@dillaman Rebase to get rid of the merge commit?

idryomov and others added some commits Sep 3, 2018

qa/tasks/cram: use suite_repo repository for all cram jobs
Currently git.ceph.com is hardcoded for all cram jobs.  Testing
modifications is a pain: one needs to push to either ceph/ceph.git or
ceph/ceph-ci.git (depending on where the ceph branch is at, triggering
unnecessary builds in the latter case) and wait for the mirror to sync.
Runs scheduled against branches in developer's forks fail.

Move away from git.ceph.com to allow mixing branches and repositories,
similar to workunits.

Fixes: https://tracker.ceph.com/issues/27211
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit 0d88876)

Conflicts:
	qa/suites/krbd/basic/tasks/krbd_blkroset.yaml
	qa/suites/krbd/basic/tasks/krbd_huge_image.yaml
	qa/suites/krbd/basic/tasks/krbd_msgr_segments.yaml
	qa/suites/krbd/basic/tasks/krbd_parent_overlap.yaml
	qa/suites/krbd/basic/tasks/krbd_whole_object_discard.yaml
- in master, the cram task is referred to in these additional yaml
files, but in luminous it's only referred to in
qa/suites/krbd/unmap/tasks/unmap.yaml
qa/tasks/cram: tasks now must live in the repository
Commit 0d88876 ("qa/tasks/cram: use suite_repo repository for all
cram jobs") removed hardcoded git.ceph.com links, but as it turned out
it is still used for nightlies.  There is no good way to accommodate
the different URL schemes, so let's get rid of URLs altogether.

Fixes: https://tracker.ceph.com/issues/27211
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit 592f566)

Conflicts:
	qa/suites/krbd/basic/tasks/krbd_blkroset.yaml
	qa/suites/krbd/basic/tasks/krbd_huge_image.yaml
	qa/suites/krbd/basic/tasks/krbd_msgr_segments.yaml
	qa/suites/krbd/basic/tasks/krbd_parent_overlap.yaml
	qa/suites/krbd/basic/tasks/krbd_whole_object_discard.yaml
- in master, the cram task is referred to in these additional yaml
files, but in luminous it's only referred to in
qa/suites/krbd/unmap/tasks/unmap.yaml
qa/tasks/workunit: factor out overrides and refspec logic
Allow for reuse in the cram task.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit e1c89b5)
qa/workunits: replace 'realpath' with 'readlink -f' in fsstress.sh
Fixes: http://tracker.ceph.com/issues/36409
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit ddb7e5e)
qa/tasks: qemu task now uses a relative path in suite repo for test
This makes it easier to re-run tests against a suite branch without
requiring a full ceph-ci build and repo.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit c1f9502)
qa/tasks/workunit: use suite branch/SHA1 when cloning workunits
Right now it's using the Ceph branch/SHA1 but it's using the suite
Git URL.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 1e3dc02)

@dillaman dillaman force-pushed the dillaman:wip-36431-luminous branch from 670c3d5 to 9cf7a2b Oct 16, 2018

@dillaman

This comment has been minimized.

Contributor

dillaman commented Oct 16, 2018

@smithfarm done

@yuriw

This comment has been minimized.

Contributor

yuriw commented Oct 19, 2018

@smithfarm

LGTM. From my POV, it can be merged if it passes rbd suite. It also touches the krbd suite and the workunit task, which could potentially have ramifications for all other suites, but we don't need to re-do 12.2.9 QE for this PR, since it doesn't change any code outside of qa/.

@yuriw yuriw merged commit 503376f into ceph:luminous Oct 21, 2018

4 checks passed

Docs: build check OK - docs built
Details
Signed-off-by all commits in this PR are signed
Details
Unmodified Submodules submodules for project are unmodified
Details
make check make check succeeded
Details

@smithfarm smithfarm changed the title from luminous: qa/workunits: replace 'realpath' with 'readlink -f' in fsstress.sh to luminous: tests: qa/workunits: replace 'realpath' with 'readlink -f' in fsstress.sh Oct 26, 2018

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