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: Workunits needlessly wget from git.ceph.com #12685

Merged
merged 7 commits into from Jan 5, 2017

Conversation

smithfarm
Copy link
Contributor

@smithfarm smithfarm commented Dec 27, 2016

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 4602884)
Root of git checkout

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 27b8eac)
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit cf29477)

Conflicts: (all trivial)
	qa/workunits/fs/test_python.sh
	qa/workunits/rados/test_python.sh
	qa/workunits/rbd/rbd_mirror.sh
	qa/workunits/rbd/rbd_mirror_stress.sh
	qa/workunits/rbd/test_librbd_python.sh
	qa/workunits/rbd/test_lock_fence.sh
@smithfarm smithfarm self-assigned this Dec 27, 2016
@smithfarm smithfarm added this to the hammer milestone Dec 27, 2016
When you have a relative path you have to include the extension.
Weird.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 5666fd6)

Conflicts:
	qa/workunits/fs/test_python.sh (not in hammer)
	qa/workunits/rbd/test_librbd_python.sh (no valgrind in hammer)
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 72d73b8)
If we checkout ceph-ci.git, and don't find a branch,
we'll try again from ceph.git. But the checkout will
already exist and the clone will fail, so we'll still
fail to find the branch.

The same can happen if a previous workunit task already
checked out the repo.

Fix by removing the repo before checkout (the first and
second times).  Note that this may break if there are
multiple workunit tasks running in parallel on the same
role.  That is already racy, so if it's happening, we'll
want to switch to using a truly unique clonedir for each
instantiation.

Fixes: http://tracker.ceph.com/issues/18336
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 2a7013c)
smithfarm added a commit that referenced this pull request Jan 2, 2017
….ceph.com

Reviewed-by: Nathan Cutler <ncutler@suse.com>
@smithfarm smithfarm changed the title hammer: Workunits needlessly wget from git.ceph.com hammer: tests: Workunits needlessly wget from git.ceph.com Jan 2, 2017
This commit fixes a regression introduced by
cf29477

Fixes: http://tracker.ceph.com/issues/18388
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 91231de)
@smithfarm
Copy link
Contributor Author

@athanatos This just passed rados, rgw, rbd, powercycle, and fs runs at http://tracker.ceph.com/issues/17151#note-38

Do you think it's OK to merge?

@athanatos athanatos merged commit 3e62a1d into ceph:hammer Jan 5, 2017
@jan--f jan--f deleted the wip-18273-hammer branch February 8, 2017 20:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants