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

kraken: tests: qa/tasks/workunit: Backport repo fixes from master #14487

Merged
merged 5 commits into from Apr 18, 2017

Conversation

zmc
Copy link
Member

@zmc zmc commented Apr 12, 2017

tchaikov and others added 5 commits April 12, 2017 10:21
as "workunits" reside in ceph/qa/workunits, it's more intuitive to
respect suite-repo option when cloning workunits.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 4cf28de)
…workunit repo

if we run upgrade test, where, for example, "jewel" is not in
ceph-ci.git repo, we should check ceph.git to clone the workunits.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit edceabb)
Help avoid killing git.ceph.com.  A depth 1 clone takes about
7 seconds, whereas a full one takes about 3:40 (much of it
waiting for the server to create a huge compressed pack)

Signed-off-by: Dan Mick <dan.mick@redhat.com>
(cherry picked from commit c1309fb)
c1309fb failed to specify a branch when cloning using --depth=1, which
by default clones the HEAD. and we can not "git checkout" a specific
sha1 if it is not HEAD, after cloning using '--depth=1', so in this
change, we dispatch "tag", "branch", "HEAD" using three Refspec classes.

Signed-off-by: Kefu Chai <kchai@redhat.com>
Signed-off-by: Dan Mick <dan.mick@redhat.com>
(cherry picked from commit 9ca7ccf)
…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>
(cherry picked from commit 4708015)
@zmc zmc requested a review from tchaikov April 12, 2017 16:22
@tchaikov
Copy link
Contributor

tchaikov commented Apr 12, 2017

@smithfarm this PR is a superset of your #14394. as @zmc would like to have the other two commits in kraken too.

@smithfarm
Copy link
Contributor

@tchaikov OK, but do the other 2 commits need to be backported to all the other named branches, too? Or is it enough to have them in kraken? See http://tracker.ceph.com/issues/19429

@tchaikov
Copy link
Contributor

@smithfarm no, as a feature, they are not needed. the minimum fix to accommodate the change on teuthology is #14394. but i am fine either way.

@tchaikov tchaikov requested a review from smithfarm April 13, 2017 07:33
@smithfarm smithfarm added this to the kraken milestone Apr 14, 2017
@smithfarm
Copy link
Contributor

Jenkins re-test this please

@zmc zmc merged commit 13de280 into ceph:kraken Apr 18, 2017
@zmc zmc deleted the wip-kraken-workunit branch April 18, 2017 20:17
@smithfarm smithfarm changed the title qa/tasks/workunit: Backport repo fixes from master kraken: tests: qa/tasks/workunit: Backport repo fixes from master Aug 2, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants