Skip to content

[v5.4-rhel] Enable TMT and remove Cirrus #26183

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

Draft
wants to merge 3 commits into
base: v5.4-rhel
Choose a base branch
from

Conversation

lsm5
Copy link
Member

@lsm5 lsm5 commented May 22, 2025

Does this PR introduce a user-facing change?

None

@openshift-ci openshift-ci bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. release-note-none labels May 22, 2025
Copy link

Failed to load packit config file:

Cannot parse package config. ValidationError({'jobs[0].packages': 'Undefined package(s) referenced: podman-rhel.', 'jobs[1].packages': 'Undefined package(s) referenced: podman-rhel.'})

For more info, please check out the documentation or contact the Packit team. You can also use our CLI command config validate or our pre-commit hooks for validation of the configuration.

Copy link
Contributor

openshift-ci bot commented May 22, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: lsm5

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 22, 2025
lsm5 added 2 commits May 22, 2025 10:41
This reverts commit 64aaa45.

Signed-off-by: Lokesh Mandvekar <[email protected]>
Signed-off-by: Lokesh Mandvekar <[email protected]>
@lsm5 lsm5 force-pushed the v5.4-rhel-tmt branch 3 times, most recently from f8c817f to e823b71 Compare May 22, 2025 14:45
Copy link

Ephemeral COPR build failed. @containers/packit-build please check.

Copy link

Tests failed. @containers/packit-build please check.

Copy link

Ephemeral COPR build failed. @containers/packit-build please check.

@lsm5 lsm5 force-pushed the v5.4-rhel-tmt branch 2 times, most recently from 85de7cb to 9bc6d8a Compare May 22, 2025 20:18
@Luap99
Copy link
Member

Luap99 commented May 26, 2025

We either must reconfigure merge protection to be turned off or hard code the tasks names there to the tmt ones for all rhel branches. I guess for RHEL branches the task names don't change so setting up branch protection and for each branch will be acceptable. (And I guess long term we wanted to drop the RHEL branches from the main repo here anyway so this would not be a forever situation)

Also why are we testing epel and nightly branches, would it not make much more sense to target the actual branches this version is being shipped in? I would expect to be tested against RHEL 9.6/10.0 only. That way we know the right go version is being used and the tests pass on the final version that should massively reduce any post merge surprises.

@Luap99
Copy link
Member

Luap99 commented May 26, 2025

Oh on other thing there is must include Jira link for RHEL CI setup via cirrus via the auto team. I am not sure what our commitment there is/was but I think we must have a way to ensure that only RHEL Jira approved changes can get merged.

@lsm5
Copy link
Member Author

lsm5 commented May 26, 2025

We either must reconfigure merge protection to be turned off or hard code the tasks names there to the tmt ones for all rhel branches. I guess for RHEL branches the task names don't change so setting up branch protection and for each branch will be acceptable. (And I guess long term we wanted to drop the RHEL branches from the main repo here anyway so this would not be a forever situation)

Agreed.

Also why are we testing epel and nightly branches, would it not make much more sense to target the actual branches
this version is being shipped in?

RE: epel, the way copr is setup, epel jobs are the most convenient for RHEL testing. The copr epel targets are RHEL + EPEL.

RE: nightly compose, the current rhel-10-main and rhel-9-main have v5.4, so I've enabled them here atm.

I would expect to be tested against RHEL 9.6/10.0 only. That way we know the right go version is being used and the tests pass on the final version that should massively reduce any post merge surprises.

Yup, I'll enable the other relevant targets too.

Eventually, it would be good to add these jobs in the main branch along with Packit's PR-label-based job triggers, which would make it a lot easier to enable these jobs whenever we cut a new rhel maint branch, instead of adding such a change separately to every new rhel branch.

Oh on other thing there is must include Jira link for RHEL CI setup via cirrus via the auto team. I am not sure what our commitment there is/was but I think we must have a way to ensure that only RHEL Jira approved changes can get merged.

I'll look into that. Thanks.

@lsm5
Copy link
Member Author

lsm5 commented May 26, 2025

Eventually, it would be good to add these jobs in the main branch along with Packit's PR-label-based job triggers, which would make it a lot easier to enable these jobs whenever we cut a new rhel maint branch, instead of adding such a change separately to every new rhel branch.

I'm also checking with the packit team about additional workflow options which could possibly help us maintain the official rpm through the rhel maint branch itself instead of having 2 separate repos. If we move hosting for rhel branches elsewhere, then of course my quoted comment won't be relevant.

@Luap99
Copy link
Member

Luap99 commented May 27, 2025

Eventually, it would be good to add these jobs in the main branch along with Packit's PR-label-based job triggers, which would make it a lot easier to enable these jobs whenever we cut a new rhel maint branch, instead of adding such a change separately to every new rhel branch.

I mean we talk about a branch once every six months so I would not worry about that.

If we move hosting for rhel branches elsewhere, then of course my quoted comment won't be relevant.

I think we must, given CNCF we cannot really have RHEL specific code in the same repo. Basic access rule would not work out. And I think that is actually a strong point in favour of tmt. Because we can easily switch to the centos gitlab or whatever and keep using the same packit/tmt config and infra I assume. And then we can have proper merge protection on such new repo for tmt based tasks.

@lsm5 lsm5 force-pushed the v5.4-rhel-tmt branch 3 times, most recently from 55d7e39 to 35d5205 Compare June 5, 2025 18:18
Copy link

Failed to load packit config file:

Please correct data and retry.

For more info, please check out the documentation or contact the Packit team. You can also use our CLI command config validate or our pre-commit hooks for validation of the configuration.

@lsm5 lsm5 force-pushed the v5.4-rhel-tmt branch 2 times, most recently from e463434 to aaa10b6 Compare June 5, 2025 18:39
Signed-off-by: Lokesh Mandvekar <[email protected]>
@lsm5 lsm5 force-pushed the v5.4-rhel-tmt branch from aaa10b6 to 3bbfc6d Compare June 5, 2025 19:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. release-note-none
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants