It seems that these four scripts didn't previously require the ros_buildfarm module to be importable to run. Rather than update all of their calls throughout ros_buildfarm (there are numerous), take the same approach as was used in the git and apt wrapper scripts previously to inject the module into the import search path.
This regression probably only affects Jenkins buildfarms, which is why CI didn't catch it.
I'm doing 2 things in this PR:
Stop double-wrapping apt.py and git.py wrapper scripts, which I didn't realize I was doing. This is an optimization, but changes to those scripts were necessary to restore support to this mechanism anyway.
Extending the pattern used by those scripts to subprocess_reaper.py and docker_pull_baseimage.py so that they also do not require ros_buildfarm in PYTHONPATH.
It seems that these four scripts didn't previously require the ros_buildfarm module to be importable to run. Rather than update all of their calls throughout ros_buildfarm (there are numerous), take the same approach as was used in the git and apt wrapper scripts previously to inject the module into the import search path.
This regression probably only affects Jenkins buildfarms, which is why CI didn't catch it.
I'm doing 2 things in this PR:
apt.pyandgit.pywrapper scripts, which I didn't realize I was doing. This is an optimization, but changes to those scripts were necessary to restore support to this mechanism anyway.subprocess_reaper.pyanddocker_pull_baseimage.pyso that they also do not requireros_buildfarminPYTHONPATH.Fixes: #973