unbound variable error when calling puppet-merge script with an explicit treeish
Closed, ResolvedPublic
Actions

Assigned To

Authored By

	CDanis
	Sep 28 2020, 3:59 PM

Description

It also seems like it's probably invoking puppet-merge.py incorrectly in this case?

❌cdanis@puppetmaster1001.eqiad.wmnet ~ 🕛☕ sudo puppet-merge 8f00bac   
usage: puppet-merge.py [-h] [-y] [-q] [-d] (-p | -o) sha1
puppet-merge.py: error: unrecognized arguments: 
/usr/local/bin/puppet-merge: line 167: LABS_EXIT: unbound variable

Details

	Subject	Repo	Branch	Lines +/-
	puppet-merge: correctly handle passing through sha1 vs FETCH_HEAD	operations/puppet	production	+12 -8

Customize query in gerrit

Event Timeline

CDanis created this task.Sep 28 2020, 3:59 PM

Restricted Application added a subscriber: Aklapper. · View Herald TranscriptSep 28 2020, 3:59 PM

I took a quick look and it seems the issue is caused when FETCH_HEAD_OR_EMPTY is empty which causes puppet-merge.py to get called with two positional arguments i.e.:

/usr/local/bin/puppet-merge.py --ops 8f00bac541b3bcebcd3df383796aa4d00d8fa5bc ''

I think we should try to push FETH_HEAD to ORIG_ARGS instead of creating the new variable FETCH_HEAD_OR_EMPTY but i only took a very quick look

Change 630897 had a related patch set uploaded (by Jbond; owner: John Bond):
[operations/puppet@production] puppet-merge: correctly handle passing through sha1 vs FETCH_HEAD

https://gerrit.wikimedia.org/r/630897

gerritbot added a project: Patch-For-Review.Sep 29 2020, 3:58 PM

test updated

herron triaged this task as Medium priority.Sep 30 2020, 5:25 PM

Change 630897 merged by Jbond:
[operations/puppet@production] puppet-merge: correctly handle passing through sha1 vs FETCH_HEAD

https://gerrit.wikimedia.org/r/630897

Maintenance_bot removed a project: Patch-For-Review.Nov 26 2020, 5:10 PM

Aklapper added a project: Infrastructure-Foundations.Jun 21 2021, 8:59 PM

jbond closed this task as Resolved.Jun 12 2023, 2:59 PM

jbond claimed this task.