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

[sync] prometheus-unit-tests from rhoai #1662

Merged
merged 3 commits into from
Feb 14, 2025

Conversation

biswassri
Copy link
Contributor

@biswassri biswassri commented Feb 12, 2025

Description

cherry picked #1355
cherry picked #1398

How Has This Been Tested?

make test-alerts

Screenshot or short clip

Merge criteria

  • You have read the contributors guide.
  • Commit messages are meaningful - have a clear and concise summary and detailed explanation of what was changed and why.
  • Pull Request contains a description of the solution, a link to the JIRA issue, and to any dependent or related Pull Request.
  • Testing instructions have been added in the PR body (for PRs involving changes that are not immediately obvious).
  • The developer has manually tested the changes and verified that the changes work

@biswassri
Copy link
Contributor Author

biswassri commented Feb 12, 2025

/cc @StevenTobin

I know some extra files were moved in, but I just wanted to bring out the I think we can delete the *rules.yaml files

@zdtsw
Copy link
Member

zdtsw commented Feb 12, 2025

target branch to "rhoai" not "main"

@biswassri
Copy link
Contributor Author

target branch to "rhoai" not "main"

@zdtsw these changes are already in rhoai, I'm trying to sync rhoai to main.

Copy link

codecov bot commented Feb 12, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 20.36%. Comparing base (a5c75a8) to head (6e83c4c).
Report is 1 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #1662   +/-   ##
=======================================
  Coverage   20.36%   20.36%           
=======================================
  Files         164      164           
  Lines       11151    11151           
=======================================
  Hits         2271     2271           
  Misses       8655     8655           
  Partials      225      225           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@zdtsw
Copy link
Member

zdtsw commented Feb 13, 2025

target branch to "rhoai" not "main"

@zdtsw these changes are already in rhoai, I'm trying to sync rhoai to main.

ok, i misread the sync as from upstream to downstream
but if it is then other way around, it is backport to odh

@biswassri
Copy link
Contributor Author

biswassri commented Feb 13, 2025

ok, i misread the sync as from upstream to downstream but if it is then other way around, it is backport to odh

I actually used some of the other PRs which had similar goals of cherry-picking from rhoai to main and they had [sync] as the description. I was just trying to be consistent with how we describe our PRs. Should I change it to backport?

@biswassri
Copy link
Contributor Author

/cc @StevenTobin

@openshift-ci openshift-ci bot requested a review from StevenTobin February 13, 2025 12:38
@StevenTobin
Copy link
Contributor

Tested locally and runs fine. It seems like on main the files that are in the test/prometheus-unit-tests directory are the generated *.rule.yaml files. Can we remove them in this PR since we are replacing them with the correct content.

@biswassri
Copy link
Contributor Author

Tested locally and runs fine. It seems like on main the files that are in the test/prometheus-unit-tests directory are the generated *.rule.yaml files. Can we remove them in this PR since we are replacing them with the correct content.

Done!

@StevenTobin
Copy link
Contributor

Verified by:

  • Checking out locally.
  • Running make test-alerts verifying make target runs to completion.
  • Verifying the temporary files are ignored correctly.
  • Running make clean verifying the temporary files are deleted.

/lgtm

@StevenTobin
Copy link
Contributor

/approve

@openshift-ci openshift-ci bot added the lgtm label Feb 14, 2025
Copy link

openshift-ci bot commented Feb 14, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: StevenTobin

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-merge-bot openshift-merge-bot bot merged commit 1748aef into opendatahub-io:main Feb 14, 2025
11 checks passed
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.

4 participants