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

[v5.2-rhel] Update CI on v5.2-rhel to check for jira links #23720 #23764

Merged

Conversation

alexlarsson
Copy link
Contributor

This backports the changes from #23622 to ensure that PRs on the -rhel branches have a Jira references.

Also, we need to update DEST_BRANCH on this branch as that was not done yet.

Fixes: https://issues.redhat.com/browse/VROOM-20772

@openshift-ci openshift-ci bot added the do-not-merge/release-note-label-needed Enforce release-note requirement, even if just None label Aug 27, 2024
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 27, 2024
@alexlarsson alexlarsson changed the base branch from main to v5.2-rhel August 27, 2024 07:06
@github-actions github-actions bot added machine kind/api-change Change to remote API; merits scrutiny labels Aug 27, 2024
Copy link

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

…linked

This is a backport of #17193af962453a3cfde2d9f25c0fea29e3c91cf3
(from containers#23622)

In the RHEL specific branches we want to ensure that all MRs link to
at least one downstream Jira ticket. To do this we add a new test in
validate-source similar to the existing pr-should-include-tests. This
test only runs on actual pull requests.

The syntax for linking to a Jira is "Fixes " or "Fixes: ", followed by
one jira links, like so:

```
Fixes https://issues.redhat.com/browse/RHEL-50506
Fixes: https://issues.redhat.com/browse/RHEL-50506
```

Note: This is the same syntax as for a regular github issue reference.

Signed-off-by: Alexander Larsson <alexl@redhat.com>
@alexlarsson alexlarsson force-pushed the check-jira-links-5.2 branch from cea62b1 to 03c6986 Compare August 27, 2024 07:15
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 27, 2024
@alexlarsson
Copy link
Contributor Author

Also, it seems this branch didn't bump DEST_BRANCH in .cirrus.yml

Signed-off-by: Alexander Larsson <alexl@redhat.com>
@alexlarsson alexlarsson force-pushed the check-jira-links-5.2 branch from eb34f9d to 3b44544 Compare August 27, 2024 08:01
@alexlarsson
Copy link
Contributor Author

Unclear why the max and windows tests fail. They all get some 404 http errror.

@Luap99
Copy link
Member

Luap99 commented Aug 27, 2024

Unclear why the max and windows tests fail. They all get some 404 http errror.

Because we added no rhel branch conditions to the windows/macos build jobs (which does make sense) but do not have the same condition to the machine tasks (which is wrong). Obviously a rhel branch needs no windows/macos testing so we need to remove the tasks.

As a quick and easy fix I suggest you just remove the entire podman_machine_windows_task and podman_machine_mac_task from cirrus.yml here and I can work on a proper conditional fix for the main branch.

These are not needed for RHEL and are failing du to lack of branch
conditions in cirrus.

Signed-off-by: Alexander Larsson <alexl@redhat.com>
Copy link
Member

@Luap99 Luap99 left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Contributor

openshift-ci bot commented Aug 27, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: alexlarsson, Luap99

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 Aug 27, 2024
@mheon
Copy link
Member

mheon commented Aug 27, 2024

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Aug 27, 2024
@Luap99 Luap99 added release-note-none and removed do-not-merge/release-note-label-needed Enforce release-note requirement, even if just None labels Aug 27, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit c10f007 into containers:v5.2-rhel Aug 27, 2024
76 checks passed
Luap99 added a commit to Luap99/libpod that referenced this pull request Aug 27, 2024
We already exclude the build jobs this is causing the machine tasks to
fail as noticed in containers#23764. Given we do not need windows/macos testing
for RHEL we have to skip them there.

While we try to only use only_if the problem here is that we would need
to duplicate the big only_if_machine_test string and work the rhel
condition into it which doesn't work with the current logic either so we
would need to change the logic flow there which then doesn't work with
our cirrus_yaml_test.py selftest. Therefore I think using skip here is
easier.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
@stale-locking-app stale-locking-app bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Nov 26, 2024
@stale-locking-app stale-locking-app bot locked as resolved and limited conversation to collaborators Nov 26, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. kind/api-change Change to remote API; merits scrutiny lgtm Indicates that a PR is ready to be merged. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. machine release-note-none
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants