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

qa/tasks/workunit.py: use "overrides" as the default settings of workunit #14281

Merged
merged 1 commit into from Apr 5, 2017

Conversation

Projects
None yet
3 participants
@tchaikov
Contributor

tchaikov commented Apr 1, 2017

otherwise the settings in "workunit" tasks are always overridden by the
settings in template config. so we'd better follow the way of how
"install" task updates itself with the "overrides" settings: it uses the
"overrides" as the defaults.

Fixes: http://tracker.ceph.com/issues/19429
Signed-off-by: Kefu Chai kchai@redhat.com

@tchaikov tchaikov requested review from dmick and dillaman Apr 1, 2017

@tchaikov

This comment has been minimized.

Contributor

tchaikov commented Apr 1, 2017

tested at http://pulpito.ceph.com/kchai-2017-04-01_16:57:29-rados-master---basic-mira/ using

teuthology-suite --filter="rados/upgrade/jewel-x-singleton/{0-cluster/{openstack.yaml start.yaml} 1-jewel-install/jewel.yaml 2-partial-upgrade/firsthalf.yaml 3-thrash/default.yaml 4-workload/{rbd-cls.yaml rbd-import-export.yaml readwrite.yaml snaps-few-objects.yaml} 5-workload/{radosbench.yaml rbd_api.yaml} 6-finish-upgrade.yaml 7-luminous.yaml 8-workload/{rbd-python.yaml rgw-swift.yaml snaps-many-objects.yaml}}" \
 --suite rados --machine-type=mira \
 --ceph master --ceph-repo https://github.com/ceph/ceph.git \
 --suite-repo https://github.com/tchaikov/ceph.git --suite-branch wip-19429
$ egrep '(clone|Cloning)\ ' /a//kchai-2017-04-01_16:57:29-rados-master---basic-mira/976811/teuthology.log
2017-04-01T17:12:01.342 INFO:teuthology.orchestra.run.mira084:Running: 'rm -rf /home/ubuntu/cephtest/clone.client.0 && git clone --depth 1 --branch jewel https://github.com/tchaikov/ceph.git /home/ubuntu/cephtest/clone.client.0 && cd /home/ubuntu/cephtest/clone.client.0'
2017-04-01T17:12:01.455 INFO:tasks.workunit.client.0.mira084.stderr:Cloning into '/home/ubuntu/cephtest/clone.client.0'...
2017-04-01T17:12:20.416 INFO:teuthology.orchestra.run.mira084:Running: 'rm -rf /home/ubuntu/cephtest/clone.client.0 && git clone --depth 1 --branch jewel https://github.com/tchaikov/ceph.git /home/ubuntu/cephtest/clone.client.0 && cd /home/ubuntu/cephtest/clone.client.0'
2017-04-01T17:12:20.494 INFO:tasks.workunit.client.0.mira084.stderr:Cloning into '/home/ubuntu/cephtest/clone.client.0'...
qa/tasks/workunit.py: use "overrides" as the default settings of work…
…unit

otherwise the settings in "workunit" tasks are always overridden by the
settings in template config. so we'd better follow the way of how
"install" task updates itself with the "overrides" settings: it uses the
"overrides" as the *defaults*.

Fixes: http://tracker.ceph.com/issues/19429
Signed-off-by: Kefu Chai <kchai@redhat.com>

@tchaikov tchaikov changed the title from tasks/workunit.py: use "overrides" as the default settings of workunit to qa/tasks/workunit.py: use "overrides" as the default settings of workunit Apr 2, 2017

@tchaikov

This comment has been minimized.

Contributor

tchaikov commented Apr 3, 2017

@yuriw this is the fix for one of the known test failures.

@tchaikov tchaikov requested a review from jdurgin Apr 4, 2017

@tchaikov

This comment has been minimized.

Contributor

tchaikov commented Apr 4, 2017

@dmick @jdurgin could you take a look at your convenience?

@jdurgin

jdurgin approved these changes Apr 4, 2017

Looks good! This is the way I thought it always worked...

@tchaikov tchaikov merged commit 24e69d7 into ceph:master Apr 5, 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

@tchaikov tchaikov deleted the tchaikov:wip-19429 branch Apr 5, 2017

@dillaman

This comment has been minimized.

Contributor

dillaman commented Apr 5, 2017

Related to issue ceph/teuthology#1055

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