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

Skip signals from older runs of the same workflows #129291

Closed
wants to merge 3 commits into from

Conversation

huydhn
Copy link
Contributor

@huydhn huydhn commented Jun 22, 2024

I discovered this bug in trymerge when debugging #129013 in which Dr.CI reported no relevant failures while mergebot complained about some unrelated ROCm failures #129013 (comment).

It turns out that mergebot took into account stale signals from older runs of the same workflow here. For example,

Notice that both runs came from the same push to commit be69191 with ciflow/rocm/129013. So, we just need to check the signals from the newer run.

Note that Dr.CI handles this part correctly using the logic in https://github.com/pytorch/test-infra/blob/main/torchci/pages/api/drci/drci.ts#L1079-L1088. So, the fix in this PR is to bring the same logic to trymerge.

Testing

pytest -v test_trymerge.py

@huydhn huydhn requested a review from ZainRizvi June 22, 2024 00:45
@huydhn huydhn requested a review from a team as a code owner June 22, 2024 00:45
Copy link

pytorch-bot bot commented Jun 22, 2024

🔗 Helpful Links

🧪 See artifacts and rendered test results at hud.pytorch.org/pr/129291

Note: Links to docs will display an error until the docs builds have been completed.

✅ No Failures

As of commit e4a8bab with merge base 1c75ddf (image):
💚 Looks good so far! There are no failures yet. 💚

This comment was automatically generated by Dr. CI and updates every 15 minutes.

@pytorch-bot pytorch-bot bot added the topic: not user facing topic category label Jun 22, 2024
@@ -397,6 +397,7 @@ def test_gql_complexity(self, *args: Any) -> None:
# self.assertGreater(len(pr.get_checkrun_conclusions()), 3)
self.assertGreater(pr.get_commit_count(), 60)

@skip("GitHub doesn't keep this data anymore")
Copy link
Contributor

Choose a reason for hiding this comment

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

why not delete the test if we don't expect it to start working again later?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It might be useful to know this in case there is a more recent sample, but it's very unlikely I guess, so cleaning it up then


if (
workflow_id not in workflows
or workflows[workflow_id].run_id < workflow_run_id
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: consider adding a comment explaining that this check is to help ignore reruns

@huydhn
Copy link
Contributor Author

huydhn commented Jun 26, 2024

@pytorchbot merge -f 'CI only fix, no need to run trunk jobs'

@pytorchmergebot
Copy link
Collaborator

Merge started

Your change will be merged immediately since you used the force (-f) flag, bypassing any CI checks (ETA: 1-5 minutes). Please use -f as last resort and instead consider -i/--ignore-current to continue the merge ignoring current failures. This will allow currently pending tests to finish and report signal before the merge.

Learn more about merging in the wiki.

Questions? Feedback? Please reach out to the PyTorch DevX Team

Advanced Debugging
Check the merge workflow status
here

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants