Check that rpms installed in tmt come from copr #676
Closed
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
kwk
commented
Aug 27, 2024
tests/snapshot-gating.fmf
Outdated
| - name: Assert correct llvm package is installed | ||
| how: shell | ||
| order: 99 | ||
| script: tests/assert_llvm.sh |
There was a problem hiding this comment.
Suggested change
| script: tests/assert_llvm.sh | |
| script: rpm -q llvm-libs | grep -P "Version[^:]+:.*~pre.*" |
This should do the trick.
There was a problem hiding this comment.
I understand that your point here is to keep it simple. I do think that the script might be more beneficial in this case, though. The script gives us some advantages here:
- We can make several checks at the
preparestep end, all grouped under the same script. This may include, checking that the copr repo is reachable. - We can write more complex logic. For example testing several packages rather that llvm-libs only.
- We can properly report what failed and why.
For example, upon wrong package installation with the script, this is what we see in the report:
prepare step failed
The exception was caused by 1 earlier exceptions
Cause number 1:
Command '/var/ARTIFACTS/work-snapshot-gatingejv1c0ks/tests/snapshot-gating/tree/tmt-prepare-wrapper.sh-Assert-correct-llvm-package-is-installed-default-0' returned 1.
stdout (2 lines)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
*** Unexpected llvm package installed: llvm-18.1.8-2.fc41.x86_64
*** Expected llvm: llvm-20.0.0~pre20240825.g3ef64f7ab5b865-1.fc42.x86_64
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
However, using the plain command, we would see this instead, which is much less intuitive:
prepare step failed
The exception was caused by 1 earlier exceptions
Cause number 1:
Command '/var/tmp/tmt/run-077/tests/snapshot-gating/tree/tmt-prepare-wrapper.sh-Assert-correct-llvm-package-is-installed-default-0' returned 1.
kwk
commented
Aug 27, 2024
tests/assert_llvm.sh
Outdated
| @@ -0,0 +1,34 @@ | |||
| #!/bin/bash | |||
There was a problem hiding this comment.
I think you can remove this file.
kwk
commented
Aug 27, 2024
tests/snapshot-gating.fmf
Outdated
| @@ -23,6 +23,11 @@ prepare: | |||
| script: | | |||
| dnf install -y dnf-plugins-core | |||
| dnf config-manager --save --setopt="testing-farm-tag-repository.priority=999" || true | |||
|
|
|||
| - name: Assert correct llvm package is installed | |||
There was a problem hiding this comment.
Suggested change
| - name: Assert correct llvm package is installed | |
| - name: "Check that snapshot (~pre) version of LLVM is installed" |
added 3 commits
August 27, 2024 15:57
Add a prepare step that checks the version of installed llvm-libs to ensure it's a copr package.
Followup fedora-llvm-team#670. Reimplement without using a specific dnf. Replace the unexpanded $distname variable in the script
Before trying to modify the repo we check that it exists, hence we no longer need to mask the result of commands. This now works with both dnf4 and dnf5 Fixes fedora-llvm-team#671
|
Closed in favor of #680 |
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.
Add a script to ensure that the llvm package installed comes from the copr repo. A failure in the script aborts the test plan
See #671