Enable minimum RPM version support #2234
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
ndokos
requested changes
Apr 21, 2021
Member
ndokos
left a comment
ndokos
left a comment
There was a problem hiding this comment.
I guess I missed these in all the previous reviews :-(
ndokos
previously approved these changes
Apr 21, 2021
webbnh
previously approved these changes
Apr 21, 2021
Member
webbnh
left a comment
webbnh
left a comment
There was a problem hiding this comment.
Looks OK to merge...unless you want to fix any of the items below.
Fixes distributed-system-analysis#2142. We need to support a minimum version of an RPM in addition to an exact version. We use the `rpmdev-vercmp` from the `rpmdevtools` RPM in order to perform the matching. This also fixes a few of the `bench-scripts` to emit proper errors when the required software is not installed (they were emitting debug logs prior to this change).
Member
Author
|
Added @webbnh 's code review feedback as another commit to make it easier to review. |
webbnh
requested changes
Apr 21, 2021
Member
webbnh
left a comment
webbnh
left a comment
There was a problem hiding this comment.
Thanks for committing this last round separately (I wish I'd noticed before doing my review.... :-} ).
It looks like Mr. Jenkins is not happy with you (perhaps the problem is the one that I mention last, below). The other two comments are your call.
dbutenhof
approved these changes
Apr 22, 2021
webbnh
approved these changes
Apr 22, 2021
Member
webbnh
left a comment
webbnh
left a comment
There was a problem hiding this comment.
Looks good. My one substantial comment would probably best as a follow-on PR.
portante
added a commit
to portante/pbench
that referenced
this pull request
May 6, 2021
This fixes distributed-system-analysis#2289, a bug that was introduced in PR distributed-system-analysis#2234 (commit 5794fc1). This is a combination of two main problems. The first was that we incorrectly mocked the output of `rpm --query ...`. It only returns EVRs, which are version strings, which explicitly don't include the queried RPM name. Secondly, we were not formatting the output with a new line, so for RPMs that have multiple versions installed, the code would not work correctly. The second problem was that our `pbench-sysstat` requirement was for `12.0.3`, but the RPMs we have built publicly have version `12.0.3-1`, which won't match exactly.
portante
added a commit
to portante/pbench
that referenced
this pull request
May 6, 2021
This fixes distributed-system-analysis#2289, a bug that was introduced in PR distributed-system-analysis#2234 (commit 5794fc1). This is a combination of two main problems. The first was that we incorrectly mocked the output of `rpm --query ...`. It only returns EVRs, which are version strings, which explicitly don't include the queried RPM name. Secondly, we were not formatting the output with a new line, so for RPMs that have multiple versions installed, the code would not work correctly. The second problem was that our `pbench-sysstat` requirement was for `12.0.3`, but the RPMs we have built publicly have version `12.0.3-1`, which won't match exactly.
portante
added a commit
to portante/pbench
that referenced
this pull request
May 6, 2021
This fixes distributed-system-analysis#2289, a bug that was introduced in PR distributed-system-analysis#2234 (commit 5794fc1). This is a combination of two main problems. The first was that we incorrectly mocked the output of `rpm --query ...`. It only returns EVRs, which are version strings, which explicitly don't include the queried RPM name. Secondly, we were not formatting the output with a new line, so for RPMs that have multiple versions installed, the code would not work correctly. The second problem was that our `pbench-sysstat` requirement was for `12.0.3`, but the RPMs we have built publicly have version `12.0.3-1`, which won't match exactly.
portante
added a commit
to portante/pbench
that referenced
this pull request
May 7, 2021
This fixes distributed-system-analysis#2289, a bug that was introduced in PR distributed-system-analysis#2234 (commit 5794fc1). This is a combination of two main problems. The first was that we incorrectly mocked the output of `rpm --query ...`. It only returns EVRs, which are version strings, which explicitly don't include the queried RPM name. Additionally, we were not formatting the output with a new line, so for RPMs that have multiple versions installed, the code would not work correctly. The second problem was that our `pbench-sysstat` requirement was for `12.0.3`, but the RPMs we have built publicly have version `12.0.3-1`, which won't match exactly. We have also corrected the `rpm` mock for the bench-scripts to behave more closely to the actual `rpm` behavior.
portante
added a commit
to portante/pbench
that referenced
this pull request
May 7, 2021
This fixes distributed-system-analysis#2289, a bug that was introduced in PR distributed-system-analysis#2234 (commit 5794fc1). This is a combination of two main problems. The first was that we incorrectly mocked the output of `rpm --query ...`. It only returns EVRs, which are version strings, which explicitly don't include the queried RPM name. Additionally, we were not formatting the output with a new line, so for RPMs that have multiple versions installed, the code would not work correctly. The second problem was that our `pbench-sysstat` requirement was for `12.0.3`, but the RPMs we have built publicly have version `12.0.3-1`, which won't match exactly. We have also corrected the `rpm` mock for the bench-scripts to behave more closely to the actual `rpm` behavior.
portante
added a commit
to portante/pbench
that referenced
this pull request
May 7, 2021
This fixes distributed-system-analysis#2289, a bug that was introduced in PR distributed-system-analysis#2234 (commit 5794fc1). This is a combination of two main problems. The first was that we incorrectly mocked the output of `rpm --query ...`. It only returns EVRs, which are version strings, which explicitly don't include the queried RPM name. Additionally, we were not formatting the output with a new line, so for RPMs that have multiple versions installed, the code would not work correctly. The second problem was that our `pbench-sysstat` requirement was for `12.0.3`, but the RPMs we have built publicly have version `12.0.3-1`, which won't match exactly. We have also corrected the `rpm` mock for the bench-scripts to behave more closely to the actual `rpm` behavior.
portante
added a commit
to portante/pbench
that referenced
this pull request
May 9, 2021
This fixes distributed-system-analysis#2289, a bug that was introduced in PR distributed-system-analysis#2234 (commit 5794fc1). This is a combination of two main problems. The first was that we incorrectly mocked the output of `rpm --query ...`. It only returns EVRs, which are version strings, which explicitly don't include the queried RPM name. Additionally, we were not formatting the output with a new line, so for RPMs that have multiple versions installed, the code would not work correctly. The second problem was that our `pbench-sysstat` requirement was for `12.0.3`, but the RPMs we have built publicly have version `12.0.3-1`, which won't match exactly. We have also corrected the `rpm` mock for the bench-scripts to behave more closely to, but not exactly as, the actual `rpm` behavior.
portante
added a commit
to portante/pbench
that referenced
this pull request
May 12, 2021
This fixes distributed-system-analysis#2289, a bug that was introduced in PR distributed-system-analysis#2234 (commit 5794fc1). This is a combination of two main problems. The first was that we incorrectly mocked the output of `rpm --query ...`. It only returns EVRs, which are version strings, which explicitly don't include the queried RPM name. Additionally, we were not formatting the output with a new line, so for RPMs that have multiple versions installed, the code would not work correctly. The second problem was that our `pbench-sysstat` requirement was for `12.0.3`, but the RPMs we have built publicly have version `12.0.3-1`, which won't match exactly. We have also corrected the `rpm` mock for the bench-scripts to behave more closely to, but not exactly as, the actual `rpm` behavior.
portante
added a commit
to portante/pbench
that referenced
this pull request
May 12, 2021
This fixes distributed-system-analysis#2289, a bug that was introduced in PR distributed-system-analysis#2234 (commit 5794fc1). This is a combination of two main problems. The first was that we incorrectly mocked the output of `rpm --query ...`. It only returns EVRs, which are version strings, which explicitly don't include the queried RPM name. Additionally, we were not formatting the output with a new line, so for RPMs that have multiple versions installed, the code would not work correctly. The second problem was that our `pbench-sysstat` requirement was for `12.0.3`, but the RPMs we have built publicly have version `12.0.3-1`, which won't match exactly. We have also corrected the `rpm` mock for the bench-scripts to behave more closely to, but not exactly as, the actual `rpm` behavior.
portante
added a commit
to portante/pbench
that referenced
this pull request
May 12, 2021
This fixes distributed-system-analysis#2289, a bug that was introduced in PR distributed-system-analysis#2234 (commit 5794fc1). This is a combination of two main problems. The first was that we incorrectly mocked the output of `rpm --query ...`. It only returns EVRs, which are version strings, which explicitly don't include the queried RPM name. Additionally, we were not formatting the output with a new line, so for RPMs that have multiple versions installed, the code would not work correctly. The second problem was that our `pbench-sysstat` requirement was for `12.0.3`, but the RPMs we have built publicly have version `12.0.3-1`, which won't match exactly. We have also corrected the `rpm` mock for the bench-scripts to behave more closely to, but not exactly as, the actual `rpm` behavior.
portante
added a commit
to portante/pbench
that referenced
this pull request
May 13, 2021
This fixes distributed-system-analysis#2289, a bug that was introduced in PR distributed-system-analysis#2234 (commit 5794fc1). This is a combination of two main problems. The first was that we incorrectly mocked the output of `rpm --query ...`. It only returns EVRs, which are version strings, which explicitly don't include the queried RPM name. Additionally, we were not formatting the output with a new line, so for RPMs that have multiple versions installed, the code would not work correctly. The second problem was that our `pbench-sysstat` requirement was for `12.0.3`, but the RPMs we have built publicly have version `12.0.3-1`, which won't match exactly. We have also corrected the `rpm` mock for the bench-scripts to behave more closely to, but not exactly as, the actual `rpm` behavior.
portante
added a commit
to portante/pbench
that referenced
this pull request
May 13, 2021
This fixes distributed-system-analysis#2289, a bug that was introduced in PR distributed-system-analysis#2234 (commit 5794fc1). This is a combination of two main problems. The first was that we incorrectly mocked the output of `rpm --query ...`. It only returns EVRs, which are version strings, which explicitly don't include the queried RPM name. Additionally, we were not formatting the output with a new line, so for RPMs that have multiple versions installed, the code would not work correctly. The second problem was that our `pbench-sysstat` requirement was for `12.0.3`, but the RPMs we have built publicly have version `12.0.3-1`, which won't match exactly. We have also corrected the `rpm` mock for the bench-scripts to behave more closely to, but not exactly as, the actual `rpm` behavior.
portante
added a commit
to portante/pbench
that referenced
this pull request
May 13, 2021
This fixes distributed-system-analysis#2289, a bug that was introduced in PR distributed-system-analysis#2234 (commit 5794fc1). This is a combination of two main problems. The first was that we incorrectly mocked the output of `rpm --query ...`. It only returns EVRs, which are version strings, which explicitly don't include the queried RPM name. Additionally, we were not formatting the output with a new line, so for RPMs that have multiple versions installed, the code would not work correctly. The second problem was that our `pbench-sysstat` requirement was for `12.0.3`, but the RPMs we have built publicly have version `12.0.3-1`, which won't match exactly. We have also corrected the `rpm` mock for the bench-scripts to behave more closely to, but not exactly as, the actual `rpm` behavior.
portante
added a commit
that referenced
this pull request
May 13, 2021
This fixes #2289, a bug that was introduced in PR #2234 (commit 5794fc1). This is a combination of two main problems. The first was that we incorrectly mocked the output of `rpm --query ...`. It only returns EVRs, which are version strings, which explicitly don't include the queried RPM name. Additionally, we were not formatting the output with a new line, so for RPMs that have multiple versions installed, the code would not work correctly. The second problem was that our `pbench-sysstat` requirement was for `12.0.3`, but the RPMs we have built publicly have version `12.0.3-1`, which won't match exactly. We have also corrected the `rpm` mock for the bench-scripts to behave more closely to, but not exactly as, the actual `rpm` behavior.
riya-17
pushed a commit
to riya-17/pbench
that referenced
this pull request
Jul 6, 2021
This fixes distributed-system-analysis#2289, a bug that was introduced in PR distributed-system-analysis#2234 (commit 5794fc1). This is a combination of two main problems. The first was that we incorrectly mocked the output of `rpm --query ...`. It only returns EVRs, which are version strings, which explicitly don't include the queried RPM name. Additionally, we were not formatting the output with a new line, so for RPMs that have multiple versions installed, the code would not work correctly. The second problem was that our `pbench-sysstat` requirement was for `12.0.3`, but the RPMs we have built publicly have version `12.0.3-1`, which won't match exactly. We have also corrected the `rpm` mock for the bench-scripts to behave more closely to, but not exactly as, the actual `rpm` behavior.
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.
Fixes #2142.
We need to support a minimum version of an RPM in addition to an exact version. We use the
rpmdev-vercmpfrom therpmdevtoolsRPM in order to perform the matching.This is a proper squash of the borked merge of PR #2210.