Skip to content

Drop the requirement for dist-git-merge in discover/fmf#4915

Open
LecrisUT wants to merge 4 commits into
teemtee:mainfrom
LecrisUT:fix/4840
Open

Drop the requirement for dist-git-merge in discover/fmf#4915
LecrisUT wants to merge 4 commits into
teemtee:mainfrom
LecrisUT:fix/4840

Conversation

@LecrisUT
Copy link
Copy Markdown
Member

@LecrisUT LecrisUT commented May 21, 2026 •
edited
Loading

Pull Request Checklist

  • implement the feature
  • extend the test coverage

Closes #4840

gemini-code-assist[bot]
gemini-code-assist Bot reviewed May 21, 2026
View reviewed changes
Copy link
Copy Markdown
Contributor

@gemini-code-assist gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

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

Code Review

This pull request removes the requirement for the --dist-git-merge option when working with dist-git sources in the discover step. It removes the validation check in tmt/steps/discover/fmf.py and updates the integration tests in tests/discover/distgit.sh to reflect this change. I have no feedback to provide.

@LecrisUT LecrisUT added ci | full test Pull request is ready for the full test execution area | dist-git Implementation related to integration with the dist-git repositories. labels May 21, 2026
@github-project-automation github-project-automation Bot moved this to backlog in planning May 21, 2026
@LecrisUT LecrisUT moved this from backlog to review in planning May 21, 2026
@thrix thrix self-requested a review May 26, 2026 03:45
thrix
thrix approved these changes May 26, 2026
View reviewed changes
Copy link
Copy Markdown
Contributor

@thrix thrix left a comment

Choose a reason for hiding this comment

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

LGTM.

Because this is in changing a user facing interface, would deserve a release note in my POW.

@LecrisUT
Copy link
Copy Markdown
Member Author

LecrisUT commented May 26, 2026

Because this is in changing a user facing interface, would deserve a release note in my POW.

I considered that initially, but it was never documented that there was such a restriction.

@happz happz self-requested a review May 26, 2026 08:20
@happz happz self-assigned this May 26, 2026
@happz
Copy link
Copy Markdown
Contributor

happz commented May 26, 2026

@LecrisUT relevant tests are failing.

@LecrisUT
Copy link
Copy Markdown
Member Author

LecrisUT commented May 26, 2026

@LecrisUT relevant tests are failing.

Oh, thank you for the ping, checking it now

LecrisUT added 2 commits May 26, 2026 10:32
@LecrisUT
Drop the requirement for dist-git-merge
0d69ef7 
Signed-off-by: Cristian Le <git@lecris.dev>
@LecrisUT
Update dist-git reference to version with fmf tree
53d7d58 
Signed-off-by: Cristian Le <git@lecris.dev>
@LecrisUT
Drop special handling of distgit_dir
ff8b75d 
Signed-off-by: Cristian Le <git@lecris.dev>
@LecrisUT LecrisUT moved this from review to implement in planning May 26, 2026
@LecrisUT
Adjust tests again
e33d032 
Signed-off-by: Cristian Le <git@lecris.dev>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@thrix thrix thrix approved these changes

@happz happz Awaiting requested review from happz

+1 more reviewer

@gemini-code-assist gemini-code-assist[bot] gemini-code-assist[bot] left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@happz happz

Labels

area | dist-git Implementation related to integration with the dist-git repositories. ci | full test Pull request is ready for the full test execution

Projects

planning
Status: implement

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Remove the requirement for dist-git-merge when running dist-git-source and external repo

3 participants

@LecrisUT @happz @thrix