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: move swift.py task from teuthology to ceph, phase one (master) #15859

Merged
merged 75 commits into from Jun 26, 2017

Conversation

Projects
None yet
@smithfarm
Contributor

smithfarm commented Jun 22, 2017

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

This should add the single file qa/tasks/swift.py while preserving its history from the teuthology repo.

Phase one will consist of PRs (identical to this one) for all non-EOL branches, i.e. master, kraken, jewel, and hammer.

Phase two will be a teuthology PR ripping out the file.

jdurgin and others added some commits Jun 25, 2011

Tommi Virtanen
s3tests: Clone repository from github.
Signed-off-by: Tommi Virtanen <tommi.virtanen@dreamhost.com>
s3-tests: use radosgw-admin instead of radosgw_admin
Signed-off-by: Greg Farnum <gregory.farnum@dreamhost.com>
rgw: add swift task
still not completely working (for some reason it skips all the tests)
Tommi Virtanen
Rename "testrados" and "testswift" tasks to not begin with "test".
Anything "test*" looks like a unit test, and shouldn't be used for
actual code.
use local mirrors for (most) github urls
A cronjob on ceph.newdream.net updates these every 15 minutes.  Sigh.
rgw: access key uses url safe chars
Signed-off-by: Yehuda Sadeh <yehuda.sadeh@dreamhost.com>
rgw-logsocket: a task to verify opslog socket works
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
task/swift: change upstream repository url
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
Replace /tmp/cephtest/ with configurable path
Teuthology uses /tmp/cephtest/ as the scratch test directory for
a run.  This patch replaces /tmp/cephtest/ everywhere with a
per-run directory: {basedir}/{rundir} where {basedir} is a directory
configured in .teuthology.yaml (/tmp/cephtest if not specified),
and {rundir} is the name of the run, as given in --name.  If no name
is specified, {user}-{timestamp} is used.

To get the old behavior (/tmp/cephtest), set test_path: /tmp/cephtest
in .teuthology.yaml.

This change was modivated by #3782, which requires a test dir that
survives across reboots, but also resolves #3767.

Signed-off-by: Sam Lang <sam.lang@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Install ceph debs and use installed debs
The ceph task installs ceph using the debian
packages now, and all invocations of binaries installed
in {tmpdir}/binary/usr/local/bin/ are replace with
the use of the binaries installed in standard locations
by the debs.

Author:    Sander Pool <sander.pool@inktank.com>
Signed-off-by: Sam Lang <sam.lang@inktank.com>
Merge branch 'unstable'
Conflicts:
	teuthology/task/workunit.py
s3tests, s3readwrite, swift: cleanup explicitly
Cleaning up test dir explicitly after run, so that
consecutive runs don't fail.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
swift, s3readwrite: add missing yield
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
swift: added "--cluster" to rgw-admin command for multisite support
Signed-off-by: Ali Maredia <amaredia@redhat.com>

@smithfarm smithfarm requested review from zmc and cbodley Jun 22, 2017

@smithfarm

This comment has been minimized.

Contributor

smithfarm commented Jun 22, 2017

Can someone check if this looks right? If so, I'll open the other 3 PRs.

@zmc

This comment has been minimized.

Member

zmc commented Jun 22, 2017

Github doesn't display things like this properly; how far back does the history go with git log follow qa/tasks/swift.py ?

@smithfarm

This comment has been minimized.

Contributor

smithfarm commented Jun 22, 2017

To this commit:

commit 0a6e5d79c0f1fddb229b14b7550d43b29849261b
Author: Tommi Virtanen <tommi.virtanen@dreamhost.com>
Date:   Mon Dec 5 10:07:25 2011 -0800

    Rename "testrados" and "testswift" tasks to not begin with "test".
    
    Anything "test*" looks like a unit test, and shouldn't be used for
    actual code.
@smithfarm

This comment has been minimized.

Contributor

smithfarm commented Jun 22, 2017

We're losing some 2011 commits before that rename :-( Don't know how to preserve those.

@smithfarm smithfarm changed the title from Move swift.py task from teuthology to ceph, phase one (master) to [DNM] Move swift.py task from teuthology to ceph, phase one (master) Jun 23, 2017

@smithfarm smithfarm closed this Jun 23, 2017

@smithfarm smithfarm reopened this Jun 23, 2017

smithfarm added some commits Jun 23, 2017

tests: move swift.py task to qa/tasks
In preparation for moving this task from ceph/teuthology.git into ceph/ceph.git

The move is necessary because jewel-specific changes are needed, yet teuthology
does not maintain a separate branch for jewel. Also, swift.py is a
Ceph-specific task so it makes more sense to have it in Ceph.

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

This comment has been minimized.

Contributor

smithfarm commented Jun 23, 2017

@zmc I had not been including the history for the related files testswift.py and s3tests.py - that's why all the history was not there. Fixed now: git blame qa/tasks/swift.py and git log --follow qa/tasks/swift.py both look good.

@smithfarm smithfarm changed the title from [DNM] Move swift.py task from teuthology to ceph, phase one (master) to Move swift.py task from teuthology to ceph, phase one (master) Jun 23, 2017

@smithfarm smithfarm changed the title from Move swift.py task from teuthology to ceph, phase one (master) to tests: move swift.py task from teuthology to ceph, phase one (master) Jun 23, 2017

tests: swift.py: tweak imports
The ".." form only works within the teuthology repo. With swift.py now in the
Ceph repo, we have to be explicit.

Error message was: "ValueError: Attempted relative import beyond toplevel
package

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

zmc approved these changes Jun 26, 2017

@smithfarm smithfarm requested a review from yehudasa Jun 26, 2017

@smithfarm

This comment has been minimized.

Contributor

smithfarm commented Jun 26, 2017

Note that I do not have sufficient github privileges to override the failed signed-off-by test (and I don't know of any good way to make it pass on this PR).

@smithfarm

This comment has been minimized.

Contributor

smithfarm commented Jun 26, 2017

@zmc Thanks for the review.

@zmc zmc merged commit 5442b5f into ceph:master Jun 26, 2017

3 of 4 checks passed

Signed-off-by one or more commits in this PR are not 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-swift-task-move-master branch Jun 26, 2017

@smithfarm smithfarm referenced this pull request Jun 27, 2017

Merged

Drop swift.py task #1086

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