
Zuul v2 uses 'jenkins' as user, but Zuul v3 uses 'zuul'. Using $USER solves it for both cases. Change-Id: Ib83267ef75f91fb8f95af312d644ebe19c6307c9 (cherry picked from commit d482b16ca31c79bb614a5d967511d7ec56e1723b) (cherry picked from commit 14b17ebd31efae8b886ba95786836949751a5c39)