Bug in scap3 git submodule url rewriting
Closed, ResolvedPublic
Actions

Assigned To

Authored By

	Ottomata
	Dec 18 2015, 5:05 PM

Project Tags

Referenced Files

None

Subscribers

Description

When rewriting git submodule URLs on targets to point at deploy server, it looks like the submodule name and url is overwritten with the checkout path, instead of the actual path to the module in the .git/modules dir.

[@tin:/srv/deployment/eventlogging/eventbus]$ cat .gitmodules
[submodule "config/event-schemas"]
	path = config/schemas
	url = https://gerrit.wikimedia.org/r/mediawiki/event-schemas

[@tin:/srv/deployment/eventlogging/eventbus] (master)[4c422c3] ± ls .git/modules/config/
event-schemas

[@kafka1002:/srv/deployment/eventlogging/eventbus]$ cat .gitmodules
[submodule "config/schemas"]
	path =  config/schemas
	url =  http://tin.eqiad.wmnet/eventlogging/eventbus/.git/modules/config/schemas

http://tin.eqiad.wmnet/eventlogging/eventbus/.git/modules/config/schemas is not the proper path on tin to the submodule. It should be 'http://tin.eqiad.wmnet/eventlogging/eventbus/.git/modules/config/event-schemas`.

Revisions and Commits

rMSCA Scap
	Restricted Differential Revision	rMSCAb611b8d973aa Fix submodule rewrites

Event Timeline

Ottomata created this task.Dec 18 2015, 5:05 PM

Ottomata raised the priority of this task from to Needs Triage.

Ottomata updated the task description. (Show Details)

Ottomata added a project: Scap.

Ottomata added subscribers: Ottomata, • thcipriani.

Restricted Application added subscribers: StudiesWorld, Aklapper. · View Herald TranscriptDec 18 2015, 5:05 PM

Although, now that I am redeploying (instead of the first checkout), the url is still as I said, but the submodule checkout is working?

Ahh, no its not. I believe the submodule was cached in -cache somehow. If I remove the whole target path, and start again, I get:

Submodule 'config/schemas' (http://tin.eqiad.wmnet/eventlogging/eventbus/.git/modules/config/schemas) registered for path 'config/schemas'
Cloning into 'config/schemas'...
fatal: repository 'http://tin.eqiad.wmnet/eventlogging/eventbus/.git/modules/config/schemas/' not found
Clone of 'http://tin.eqiad.wmnet/eventlogging/eventbus/.git/modules/config/schemas' into submodule path 'config/schemas' failed

greg added a project: Deployments.Jan 5 2016, 8:11 PM

Tyler says this is fixed but he forgot to close it.

@thcipriani: can you link to the commit if it's not too difficult to find? :)

• mmodell triaged this task as Medium priority.Jan 20 2016, 5:34 PM

Yup, should be fixed. Problem was the bad assumption that the name and path of a submodule will always be the same. This is fixed in master.

Not sure if this version is deployed live just yet (definitely in beta). Commit is here: https://phabricator.wikimedia.org/D82

• mmodell added a commit: rMSCAb611b8d973aa: Fix submodule rewrites.Jan 21 2016, 4:16 PM

Bug in scap3 git submodule url rewritingClosed, ResolvedPublicActions

Description

Revisions and Commits

Event Timeline

Bug in scap3 git submodule url rewriting
Closed, ResolvedPublic
Actions