backend (mockremote): improve chroot_setup_cmd replacement for EL-5 #3
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The buildsys-build group in epel-5 does not install the buildsys-macros
package. This prevents macros like %{rhel} from being defined, which is
commonly used in spec files to properly handle older releases.
Using backreferences in the regex allows the replacement to handle both
"@buildsys-build" and "buildsys-build buildsys-macros" used by
Fedora/EL-6+ and EL-5, respectively.
|
I should also note that I'm not terribly familiar with the copr code and I did not run any test suite. I verified the lineinfile changes with a manual ansible run. This issue was report in bugzilla about a year ago. |
|
Merged. Nice work. Thank you. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The buildsys-build group in epel-5 does not install the buildsys-macros
package. This prevents macros like %{rhel} from being defined, which is
commonly used in spec files to properly handle older releases.
Using backreferences in the regex allows the replacement to handle both
"@buildsys-build" and "buildsys-build buildsys-macros" used by
Fedora/EL-6+ and EL-5, respectively.
This is one of several ways such a change could be made. Alternatives would be to specifically match
self.chroot.startswith('epel-5-')and set a variable contaning the desired packages/groups to install (@buildsys-buildby default orbuildsys-build buildsys-macrosfor epel-5). This could also be fixed in an ansible playbook for deployment.I chose this method as it was more generic and would work for someone building for EL-5 with a differently-named chroot.
In testing, the backrefs did not work as expected with ansible-1.8.4, but that's fairly old and likely isn't something worth supporting. I didn't extensively test what versions of ansible fix the issue, as I only had convenient acccess to 1.8.4 (on CentOS 6) and 1.9.4 (on Fedora 22). The backrefs work as expected on 1.9.4.
I ran into this issue while attempting to setup a copr for building the git packages from rawhide for older releases. That copr is here. In the git spec file we use the
%{rhel}macro to set a number of other globals enabling or disabling features. One specific condition in the git.spec is%if 0%{?rhel} && 0%{?rhel} <= 5.There are various work-arounds possible (using %{el5} is one), but with EL-5 support not expiring for nearly a full year, it would be convenient to be able to build the same packages which work in mock locally and in koji.