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: subst repo and branch in git.ceph.com URL in qa/tasks/cram.py and qa/tasks/qemu.py #12816

Merged
merged 4 commits into from Jan 8, 2017

Conversation

Projects
None yet
2 participants
@smithfarm
Contributor

smithfarm commented Jan 6, 2017

Inspired by bcbe45d

Fixes: http://tracker.ceph.com/issues/18440
Signed-off-by: Nathan Cutler ncutler@suse.com

@smithfarm smithfarm requested a review from dillaman Jan 6, 2017

@smithfarm

This comment has been minimized.

Contributor

smithfarm commented Jan 6, 2017

Hmmm

smithfarm@wilbur:~/src/ceph/SUSE/ceph> git push -f ceph-ci wip-18440
...
To http://github.com/ceph/ceph-ci
 ! [remote rejected] wip-18440 -> wip-18440 (pre-receive hook declined)
error: failed to push some refs to 'http://github.com/ceph/ceph-ci'
@smithfarm

This comment has been minimized.

Contributor

smithfarm commented Jan 6, 2017

@dillaman Grepping for ceph.git in qa/suites/ yields:

rbd/maintenance/qemu/xfstests.yaml:          test: http://git.ceph.com/?p=ceph.git;a=blob_plain;f=qa/run_xfstests_qemu.sh
rbd/qemu/workloads/#qemu_xfstests.yaml#:      grtest: http://git.ceph.com/?p=ceph.git;a=blob_plain;f=qa/run_xfstests_qemu.sh
rbd/qemu/workloads/qemu_bonnie.yaml:      test: http://git.ceph.com/?p=ceph.git;a=blob_plain;f=qa/workunits/suites/bonnie.sh
rbd/qemu/workloads/qemu_fsstress.yaml:      test: http://git.ceph.com/?p=ceph.git;a=blob_plain;f=qa/workunits/suites/fsstress.sh
rbd/qemu/workloads/qemu_iozone.yaml.disabled:      test: http://git.ceph.com/?p=ceph.git;a=blob_plain;f=qa/workunits/suites/iozone.sh
rbd/qemu/workloads/qemu_xfstests.yaml:      test: http://git.ceph.com/?p=ceph.git;a=blob_plain;f=qa/run_xfstests_qemu.sh

Since none of these specify {branch} I guess they won't cause failures, but will always grab whatever is in master. Is that OK or should we consider implementing {repo} and {branch} here, too?

@dillaman

This comment has been minimized.

Contributor

dillaman commented Jan 6, 2017

@smithfarm If you want to fix the 'qemu' tasks as well, I think that would be a good idea.

@smithfarm

This comment has been minimized.

Contributor

smithfarm commented Jan 7, 2017

@dillaman I looked at the qemu task and I know what needs to be done. I'll add the necessary commits to this PR and then run some validation tests.

@smithfarm

This comment has been minimized.

Contributor

smithfarm commented Jan 7, 2017

This tests the first commit:

teuthology-suite --priority 101 --suite rbd --email ncutler@suse.cz --ceph wip-18440 --machine-type smithi --kernel distro --filter="rbd/singleton/{all/formatted-output.yaml objectstore/filestore.yaml openstack.yaml}"

pass http://pulpito.ceph.com:80/smithfarm-2017-01-07_11:37:29-rbd-wip-18440-distro-basic-smithi/

Log shows:

2017-01-07T11:59:03.178 INFO:tasks.cram:fetching test http://git.ceph.com/?p=ceph-ci.git;a=blob_plain;hb=9932c06559e5f3511a451b950e6002921e550110;f=src/test/cli-integration/rbd/formatted-output.t for client.0
2017-01-07T11:59:03.181 INFO:teuthology.orchestra.run.smithi006:Running: "wget -nc -nv -P /home/ubuntu/cephtest/archive/cram.client.0 -- 'http://git.ceph.com/?p=ceph-ci.git;a=blob_plain;hb=9932c06559e5f3511a451b950e6002921e550110;f=src/test/cli-integration/rbd/formatted-output.t'"
@smithfarm

This comment has been minimized.

Contributor

smithfarm commented Jan 7, 2017

This tests the second commit:

teuthology-suite --priority 101 --suite krbd --email ncutler@suse.cz --ceph wip-18440 --machine-type smithi --kernel distro --filter="unmap/tasks/unmap.yaml" --limit 1

pass http://pulpito.ceph.com:80/smithfarm-2017-01-07_12:38:14-krbd-wip-18440-distro-basic-smithi/

Log shows:

2017-01-07T12:45:58.992 INFO:tasks.cram:fetching test http://git.ceph.com/?p=ceph-ci.git;a=blob_plain;hb=9932c06559e5f3511a451b950e6002921e550110;f=src/test/cli-integration/rbd/unmap.t for client.0
2017-01-07T12:45:59.002 INFO:teuthology.orchestra.run.smithi111:Running: "wget -nc -nv -P /home/ubuntu/cephtest/archive/cram.client.0 -- 'http://git.ceph.com/?p=ceph-ci.git;a=blob_plain;hb=9932c06559e5f3511a451b950e6002921e550110;f=src/test/cli-integration/rbd/unmap.t'"

smithfarm added some commits Jan 6, 2017

tests: subst repo name in qa/tasks/cram.py
Inspired by bcbe45d

Fixes: http://tracker.ceph.com/issues/18440
Signed-off-by: Nathan Cutler <ncutler@suse.com>
tests: subst repo name in krbd/unmap/tasks/unmap.yaml
Signed-off-by: Nathan Cutler <ncutler@suse.com>
@smithfarm

This comment has been minimized.

Contributor

smithfarm commented Jan 7, 2017

This and the following runs test the third and fourth commits:

teuthology-suite --priority 101 --suite rbd --email ncutler@suse.cz --ceph wip-18440 --machine-type smithi --kernel distro --filter="maintenance/qemu/xfstests.yaml" --limit=1

killed http://pulpito.ceph.com:80/smithfarm-2017-01-07_14:33:18-rbd-wip-18440-distro-basic-smithi/

@smithfarm

This comment has been minimized.

Contributor

smithfarm commented Jan 7, 2017

teuthology-suite --priority 101 --suite rbd --email ncutler@suse.cz --ceph wip-18440 --machine-type smithi --kernel distro --filter="workloads/qemu_bonnie.yaml" --limit=1

fail http://pulpito.ceph.com:80/smithfarm-2017-01-07_14:34:17-rbd-wip-18440-distro-basic-smithi/

@smithfarm

This comment has been minimized.

Contributor

smithfarm commented Jan 7, 2017

teuthology-suite --priority 101 --suite rbd --email ncutler@suse.cz --ceph wip-18440 --machine-type smithi --kernel distro --filter="workloads/qemu_fsstress.yaml" --limit=1

fail http://pulpito.ceph.com:80/smithfarm-2017-01-07_14:35:34-rbd-wip-18440-distro-basic-smithi/

@smithfarm

This comment has been minimized.

Contributor

smithfarm commented Jan 7, 2017

teuthology-suite --priority 101 --suite rbd --email ncutler@suse.cz --ceph wip-18440 --machine-type smithi --kernel distro --filter="workloads/qemu_xfstests.yaml" --limit=1

fail http://pulpito.ceph.com:80/smithfarm-2017-01-07_14:39:05-rbd-wip-18440-distro-basic-smithi/

@@ -132,10 +148,14 @@ def generate_iso(ctx, config):
teuthology.write_file(remote, metadata_path, f)
test_file = '{tdir}/qemu/{client}.test.sh'.format(tdir=testdir, client=client)
url = test.format(repo=repo_name, branch=refspec)

This comment has been minimized.

@dillaman

dillaman Jan 7, 2017

Contributor

test is not defined

This comment has been minimized.

@smithfarm

smithfarm Jan 7, 2017

Contributor

oops! fixed and repushed.

@smithfarm

This comment has been minimized.

Contributor

smithfarm commented Jan 7, 2017

teuthology-suite --priority 101 --suite rbd --email ncutler@suse.cz --ceph wip-18440 --machine-type smithi --kernel distro --filter="maintenance/qemu/xfstests.yaml" --limit=1

pass http://pulpito.front.sepia.ceph.com:80/smithfarm-2017-01-07_17:00:40-rbd-wip-18440-distro-basic-smithi/

BUT the log says:

2017-01-07T17:08:42.228 INFO:tasks.qemu:fetching test http://git.ceph.com/?p=ceph-ci.git;a=blob_plain;hb=HEAD;f=qa/run_xfstests_qemu.sh for client.0

so it's not picking up the branch correctly.

@@ -87,8 +88,24 @@ def generate_iso(ctx, config):
"""Execute system commands to generate iso"""
log.info('generating iso...')
testdir = teuthology.get_testdir(ctx)
refspec = ctx.config.get('branch')

This comment has been minimized.

@dillaman

dillaman Jan 7, 2017

Contributor

Hmm --- perhaps this is supposed to be just config instead of ctx.config? The test you ran should have used the sha1 but instead it used HEAD revision

This comment has been minimized.

@smithfarm

smithfarm Jan 7, 2017

Contributor

Actually, that test ran on a previous version which was using just config. The change to ctx.config is trying to fix that. I think the sha1 item was somehow getting squashed by https://github.com/ceph/ceph/blob/master/qa/tasks/qemu.py#L444 - i.e. immediately prior to the generate_iso() lambda definition.

@smithfarm

This comment has been minimized.

Contributor

smithfarm commented Jan 7, 2017

teuthology-suite --priority 101 --suite rbd --email ncutler@suse.cz --ceph wip-18440 --machine-type smithi --kernel distro --filter="maintenance/qemu/xfstests.yaml" --limit=1

pass http://pulpito.front.sepia.ceph.com:80/smithfarm-2017-01-07_19:01:12-rbd-wip-18440-distro-basic-smithi/

@smithfarm

This comment has been minimized.

Contributor

smithfarm commented Jan 7, 2017

Ahh, that looks better: fetching test http://git.ceph.com/?p=ceph-ci.git;a=blob_plain;hb=wip-18440;f=qa/run_xfstests_qemu.sh for client.0

@smithfarm

This comment has been minimized.

Contributor

smithfarm commented Jan 7, 2017

teuthology-suite --priority 101 --suite rbd --email ncutler@suse.cz --ceph wip-18440 --machine-type smithi --kernel distro --filter="workloads/qemu_bonnie.yaml" --limit=1

pass http://pulpito.front.sepia.ceph.com:80/smithfarm-2017-01-07_19:13:27-rbd-wip-18440-distro-basic-smithi/

teuthology-suite --priority 101 --suite rbd --email ncutler@suse.cz --ceph wip-18440 --machine-type smithi --kernel distro --filter="workloads/qemu_fsstress.yaml" --limit=1

pass http://pulpito.front.sepia.ceph.com:80/smithfarm-2017-01-07_19:14:00-rbd-wip-18440-distro-basic-smithi/

teuthology-suite --priority 101 --suite rbd --email ncutler@suse.cz --ceph wip-18440 --machine-type smithi --kernel distro --filter="workloads/qemu_xfstests.yaml" --limit=1

pass http://pulpito.front.sepia.ceph.com:80/smithfarm-2017-01-07_19:14:59-rbd-wip-18440-distro-basic-smithi/

@smithfarm

This comment has been minimized.

Contributor

smithfarm commented Jan 7, 2017

@dillaman I suppose it could be argued that the branch/sha1 should be controlled by --suite-branch and not --ceph? (On the other hand, how often would that make any difference?)

smithfarm added some commits Jan 7, 2017

tests: subst branch and repo in qa/tasks/qemu.py
References: http://tracker.ceph.com/issues/18440
Signed-off-by: Nathan Cutler <ncutler@suse.com>
tests: subst repo and branch in qemu test urls
References: http://tracker.ceph.com/issues/18440
Signed-off-by: Nathan Cutler <ncutler@suse.com>
@smithfarm

This comment has been minimized.

Contributor

smithfarm commented Jan 7, 2017

Changelog:

  • added a comment explaining use of ctx.config instead of config

@smithfarm smithfarm changed the title from tests: subst repo name in qa/tasks/cram.py to tests: subst repo/branch in qa/tasks/cram.py and qa/tasks/qemu.py Jan 7, 2017

@smithfarm smithfarm changed the title from tests: subst repo/branch in qa/tasks/cram.py and qa/tasks/qemu.py to tests: subst repo and branch in qa/tasks/cram.py and qa/tasks/qemu.py Jan 7, 2017

@smithfarm smithfarm changed the title from tests: subst repo and branch in qa/tasks/cram.py and qa/tasks/qemu.py to tests: subst repo and branch in git.ceph.com URL in qa/tasks/cram.py and qa/tasks/qemu.py Jan 7, 2017

@smithfarm

This comment has been minimized.

Contributor

smithfarm commented Jan 7, 2017

Anyway, the tests download from the wip branch now, and they pass.

@dillaman dillaman merged commit 0fb99b7 into ceph:master Jan 8, 2017

3 checks passed

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

@smithfarm smithfarm deleted the SUSE:wip-18440 branch Jan 8, 2017

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