search

ros-infrastructure / ros_buildfarm

ROS buildfarm based on Docker
Apache License 2.0
81 stars 96 forks source link

Work around a regression in the RPM mock tool #894

Closed cottsay closed 3 years ago

cottsay commented 3 years ago

Upstream issue: rpm-software-management/mock#753

This is a temporary hack to unblock jobs until the issue is fixed upstream.

Before: Build Status After: Build Status

nuclearsandwich commented 3 years ago

Of course I think of something as I click approve... Does it make sense to only perform the sed for the affected mock version or do we trust that whatever solution is provided will change the line enough that this will not actually result in a text change.

cottsay commented 3 years ago

Does it make sense to only perform the sed for the affected mock version or do we trust that whatever solution is provided will change the line enough that this will not actually result in a text change.

This is a good thought, but I'm moderately confident that this change will be safe even if another change solves the problem. The addMacro function can only take a string for that parameter, so I think that slightly degraded performance would be the worst we'd see. Hopefully we'll see an upstream fix soon and can just drop this hack quickly.

cottsay commented 3 years ago

Another thought - adding bash logic to detect the mock version and conditionally apply the sed is probably about as fragile as just YOLO-ing the hack unconditionally, considering how straightforward the change is.

cottsay commented 3 years ago

This change does not require deployment, and should be consumed by all future builds.