Page MenuHomePhabricator
Create Task
Maniphest T73133

[upstream] Zuul cloner fails on extension jobs against a wmf branch
Closed, ResolvedPublic
Actions

Description

Build log of https://gerrit.wikimedia.org/r/162010 for UploadWizard @ wmf/1.24wmf22

When proposing a change for an extension against a wmf branch, Zuul cloner ends up setting the mediawiki/core repo to the extension repo and thus we no more have any mediawiki install.

The job thus fails with:

Could not open input file: maintenance/install.php

Zuul clone the repository in order:

zuul.CloneMapper:Mapping projects to workspace...

mediawiki/core -> src
mediawiki/vendor -> src/vendor
mediawiki/extensions/UploadWizard -> src/extensions/UploadWizard

In mediawiki/core wmf branch, src/extensions/UploadWizard is an existing directory (it is a submodule destination) and the git repository is actually mediawiki/core! So Zuul cloner ends up setting /src (where mediawiki/core lives) to point to UploadWizard and reset the content. The workspace /src/ ends up being simply UploadWizard.

Version: wmf-deployment
Severity: normal

Attached:

file_71133.txt5 KBDownload

Details

Reference
bz71133

Event Timeline

• bzimport raised the priority of this task from to Medium.Nov 22 2014, 3:46 AM
• bzimport added a project: Continuous-Integration-Infrastructure.
• bzimport set Reference to bz71133.
hashar created this task.Sep 22 2014, 7:30 PM
hashar added a comment.Sep 23 2014, 8:42 AM

I am 100% focusing on this issue which is a bug/lack of feature in Zuul

hashar added a comment.Sep 23 2014, 2:03 PM

Patch proposed upstream: https://review.openstack.org/#/c/123437/ Will let Zuul cloner clone a repo whenever /.git/ does not exist.

hashar added a comment.Sep 23 2014, 8:10 PM

The patch I wrote fails with python2.6. I have no idea whether it is py2.6 only issue (GitPython could have a different behavior) or if it highlight a potential race condition which would end up hitting us.

hashar added a comment.Sep 24 2014, 8:16 AM

Command line to reproduce (ex on lanthanum.eqiad.wmnet)

ZUUL_PIPELINE=gate-and-submit ZUUL_UUID=38f010811238413d8cf7f5769b50b1aa ZUUL_CHANGE_IDS=162010,1 ZUUL_PATCHSET=1 ZUUL_BRANCH=wmf/1.24wmf22 ZUUL_REF=refs/zuul/wmf/1.24wmf22/Zd1cf5a14be22471abd111a869e5e9af0 ZUUL_COMMIT=rEUWIe37096a1fade ZUUL_URL=git://zuul.eqiad.wmnet ZUUL_CHANGE=162010 ZUUL_CHANGES=mediawiki/extensions/UploadWizard:wmf/1.24wmf22:refs/changes/10/162010/1 ZUUL_PROJECT=mediawiki/extensions/UploadWizard /usr/local/bin/zuul-cloner --color --verbose --branch wmf/1.24wmf22 --map /srv/deployment/integration/slave-scripts/etc/zuul-clonemap.yaml https://gerrit.wikimedia.org/r/p mediawiki/core mediawiki/vendor mediawiki/extensions/UploadWizard --workspace src

hashar added a comment.Sep 24 2014, 9:02 AM

Tested on integration-slave1001 with:

tox -e venv -- ZUUL_PIPELINE=gate-and-submit ZUUL_UUID=38f010811238413d8cf7f5769b50b1aa ZUUL_CHANGE_IDS=162010,1 ZUUL_PATCHSET=1 ZUUL_BRANCH=wmf/1.24wmf22 ZUUL_REF=refs/zuul/wmf/1.24wmf22/Zd1cf5a14be22471abd111a869e5e9af0 ZUUL_COMMIT=rEUWIe37096a1fade ZUUL_URL=git://zuul.eqiad.wmnet ZUUL_CHANGE=162010 ZUUL_CHANGES=mediawiki/extensions/UploadWizard:wmf/1.24wmf22:refs/changes/10/162010/1 ZUUL_PROJECT=mediawiki/extensions/UploadWizard zuul-cloner --color --verbose --branch wmf/1.24wmf22 --map /srv/deployment/integration/slave-scripts/etc/zuul-clonemap.yaml https://gerrit.wikimedia.org/r/p mediawiki/core mediawiki/vendor mediawiki/extensions/UploadWizard --workspace /tmp/hasharbug

I end up with:

$ find /tmp/hasharbug -type d -name .git
/tmp/hasharbug/.git
/tmp/hasharbug/vendor/.git
/tmp/hasharbug/extensions/UploadWizard/.git

\O/

hashar added a comment.Sep 24 2014, 9:30 AM

I have applied the patch on gallium/lanthanum. Wiped the workspace and retriggered a previously failing build. It passes now: https://integration.wikimedia.org/ci/job/mwext-UploadWizard-testextension/43/console

Lowering priority. Upstream patch still pending though.

hashar added a comment.Sep 24 2014, 9:39 AM

Switched mwext-UploadWizard-qunit back to use Zuul cloner ( https://gerrit.wikimedia.org/r/#/c/161459/ ). I have wiped the workspace and retriggered a wmf branch based change:

https://integration.wikimedia.org/ci/job/mwext-UploadWizard-qunit/397/console

$ find /srv/ssd/jenkins-slave/workspace/mwext-UploadWizard-qunit -type d -name .git
/srv/ssd/jenkins-slave/workspace/mwext-UploadWizard-qunit/src/.git
/srv/ssd/jenkins-slave/workspace/mwext-UploadWizard-qunit/src/extensions/UploadWizard/.git
/srv/ssd/jenkins-slave/workspace/mwext-UploadWizard-qunit/src/vendor/.git

All good.

hashar added a comment.Sep 24 2014, 9:57 AM

Upgraded Zuul on all integration labs instances

hashar added a comment.Oct 24 2014, 12:52 PM

This is fixed on our installation. Pending upstream patch to be merged in.

hashar added a comment.Oct 24 2014, 1:51 PM

The patch I proposed to upstream https://review.openstack.org/#/c/123437/ was blocked because the tests under python2.6 were broken. The root cause is a different version of git being used there (before git 1.7.8) which broke an assertion.

I have updated my patch and it now passes :-]

Krinkle renamed this task from Zuul cloner: fails on extension jobs against a wmf branch to Zuul cloner fails on extension jobs against a wmf branch.Dec 18 2014, 11:48 PM
Krinkle changed the task status from Open to Stalled.
Krinkle added projects: Zuul, Upstream.
Krinkle set Security to None.
Krinkle unsubscribed.
Krinkle subscribed.Feb 9 2015, 10:48 PM

Is this still an issue?

hashar added a comment.Feb 10 2015, 11:37 AM

It is no more an issue since I cherry picked the patch on our installation. But I am keeping the change open till upstream get it merged ( https://review.openstack.org/#/c/123437/ ).

hashar moved this task from Untriaged to Externally Blocked on the Continuous-Integration-Infrastructure board.Feb 10 2015, 11:37 AM
greg renamed this task from Zuul cloner fails on extension jobs against a wmf branch to [upstream] Zuul cloner fails on extension jobs against a wmf branch.Mar 24 2015, 8:07 PM
Luke081515 moved this task from Backlog to Bugs on the Zuul board.May 27 2016, 6:22 PM
Krinkle unsubscribed.Jun 2 2016, 8:01 PM
Paladox closed this task as Resolved.Jul 15 2016, 3:35 PM
Paladox moved this task from Externally Blocked to Done on the Continuous-Integration-Infrastructure board.
Paladox subscribed.

This is now resolved since https://review.openstack.org/#/c/123437/ was merged upstream and was deployed here.

Paladox moved this task from Backlog to Patch merged upstream on the Upstream board.Jul 15 2016, 3:36 PM
Content licensed under Creative Commons Attribution-ShareAlike (CC BY-SA) 4.0 unless otherwise noted; code licensed under GNU General Public License (GPL) 2.0 or later and other open source licenses. By using this site, you agree to the Terms of Use, Privacy Policy, and Code of Conduct. · Wikimedia Foundation · Privacy Policy · Code of Conduct · Terms of Use · Disclaimer · CC-BY-SA · GPL · Credits