Unify agent and server RPM builds #2187
Merged
Conversation
This file contains hidden or 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
dbutenhof
reviewed
Mar 30, 2021
Member
dbutenhof
left a comment
dbutenhof
left a comment
There was a problem hiding this comment.
Minor comments and questions...
portante
added
Agent
Code Infrastructure
enhancement
packaging
ndokos
reviewed
Mar 30, 2021
webbnh
commented
Mar 30, 2021
portante
previously approved these changes
Mar 30, 2021
Member
portante
left a comment
portante
left a comment
There was a problem hiding this comment.
Approving, but if you feel like making a small change, that would be great.
ndokos
previously approved these changes
Mar 31, 2021
Member
ndokos
left a comment
ndokos
left a comment
There was a problem hiding this comment.
LGTM - modulo Peter's comment on the cp.
ndokos
previously approved these changes
Mar 31, 2021
portante
approved these changes
Mar 31, 2021
dbutenhof
approved these changes
Mar 31, 2021
ndokos
approved these changes
Mar 31, 2021
portante
pushed a commit
to portante/pbench
that referenced
this pull request
Apr 13, 2021
* Unify agent and server container makefiles * Code review feedback * More code review feedback
riya-17
pushed a commit
to riya-17/pbench
that referenced
this pull request
Jul 6, 2021
* Unify agent and server container makefiles * Code review feedback * More code review feedback
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Previous to this PR, the agent and server each had separate makefiles which included separate subordinate
rpm.mkfiles, but overall, the contents were nearly identical. This PR creates a commonrpm.mkfile, and strips the agent and server makefiles down to little more than anincludedirective.I tested by comparing the output of the RPM builds without these changes and to the output with these changes; the differences were all reasonable and expected. And, I was able to install the resulting RPMs in the
pbench-develcontainer.Some of the items to pay particular attention to:
rpm-dirstarget is now a dependency of all the targets which require one or more of the directories which it creates. This means that this target no longer needs to be built explicitly, and it means that the other targets no longer need to explicitly create those directories.patchestarget now references the current directory as '.' rather than via a calculated absolute reference. This is simpler and hopefully safe.pbench-configandpbench-serverto change the script interpreter to/usr/bin/env python3; this seems to be unnecessary, so I've removed it.:=instead of=for all variables which are set to expressions which reference values outside the makefile, such as external files or shell call-outs, so that the expressions are evaluated only once.clean-sha1target worked before this change; so I removed it.verycleantarget withdistcleanand made it clean more thancleandoes.