Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

packit: Bump FMF test plan ref on release #17378

Merged
merged 1 commit into from
May 24, 2022

Conversation

martinpitt
Copy link
Member

@martinpitt martinpitt commented May 24, 2022

Fedora dist-git FMF test plans have to specify a git repo
and fixed ref for where to find the tests to run. This is bad, and at
some point it should instead just discover the tests from the upstream
source tarball instead. Until teemtee/tmt#585
gets fixed, we need to bump ref: in dist-git's plans/upstream.fmf.

Cockpituous had a hack for this [1], which we need to transplant to
packit now. Unfortunately this reintroduces files_to_sync:, but all of
this will go away when the follow-up issue
teemtee/tmt#978 gets addressed.

[1] cockpit-project/cockpituous@2ef3f6c9991


This should be the last bit. The release dist-git PR failed yesterday because it tried to run the 269 tests against 269.1. Once again I did a 269.1 release on my fork, the packit jobs succeeded, the COPR release build succeeded, and the resulting dist-git PR now has a correct plans/upstream.fmf bump:

--- a/plans/upstream.fmf
+++ b/plans/upstream.fmf
@@ -1,7 +1,7 @@
 discover:
   how: fmf
-  repository: https://github.com/cockpit-project/cockpit
+  repository: https://github.com/martinpitt/cockpit
   # FIXME: get rid of the hardcoding: https://github.com/psss/tmt/issues/585
-  ref: "269"
+  ref: "269.1"
 execute:
   how: tmt

The repository: change to my fork is from the release hack commit so that the tests would work from my fork. The dist-git PR passed all of its tests.

@martinpitt martinpitt added release-blocker Targetted for next release no-test For doc/workflow changes, or experiments which don't need a full CI run, labels May 24, 2022
@martinpitt martinpitt temporarily deployed to cockpit-dist May 24, 2022 05:27 Inactive
Fedora dist-git FMF test plans have to specify a git repo
and fixed ref for where to find the tests to run. This is bad, and at
some point it should instead just discover the tests from the upstream
source tarball instead. Until teemtee/tmt#585
gets fixed, we need to bump `ref:` in dist-git's plans/upstream.fmf.

Cockpituous had a hack for this [1], which we need to transplant to
packit now. Unfortunately this reintroduces `files_to_sync:`, but all of
this will go away when the follow-up issue
teemtee/tmt#978 gets addressed.

Create the file in tmp/ instead of plans/ (from where it would be easier
to sync) as packit refuses operation on an unclean tree. tmp/ is in
.gitignore.

[1] cockpit-project/cockpituous@2ef3f6c9991
@martinpitt
Copy link
Member Author

Refusing operation on an unclean tree argh argh . Fixed.

@martinpitt martinpitt temporarily deployed to cockpit-dist May 24, 2022 05:34 Inactive
@martinpitt
Copy link
Member Author

dist-git PR finished its integration tests, all green. So this is ready for review/landing.

@martinpitt martinpitt requested a review from mvollmer May 24, 2022 07:00
Copy link
Member

@mvollmer mvollmer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can't say that I understand the details here, but it all looks reasonable and green to me.

@mvollmer mvollmer merged commit 8f48c47 into cockpit-project:main May 24, 2022
@martinpitt martinpitt deleted the packit-fmf branch May 24, 2022 12:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
no-test For doc/workflow changes, or experiments which don't need a full CI run, release-blocker Targetted for next release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants