Skip to content

USHIFT-6338: Use single instances of Prometheus and Loki for all tests#5779

Merged
openshift-merge-bot[bot] merged 12 commits intoopenshift:mainfrom
pmtk:single-prom-loki
Dec 10, 2025
Merged

USHIFT-6338: Use single instances of Prometheus and Loki for all tests#5779
openshift-merge-bot[bot] merged 12 commits intoopenshift:mainfrom
pmtk:single-prom-loki

Conversation

@pmtk
Copy link
Member

@pmtk pmtk commented Nov 20, 2025

No description provided.

@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 20, 2025
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 20, 2025

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@pmtk
Copy link
Member Author

pmtk commented Nov 20, 2025

/test all

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 20, 2025
Copy link
Contributor

@agullon agullon left a comment

Choose a reason for hiding this comment

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

The resourcedetection processor is a great idea, but I do have 2 concerns going forward with this approach:

  • It'll be more complicated to run scenarios in local env, because the Prometheus/Loki server must be started before running the test instead of within the scenario.
  • Prometheus and Loki servers are always started, but in some cases we don't need them because there are no scenarios using Prometheus or Loki, for example: test/scenarios/presubmits

Comment on lines 98 to +109
MicroShift Reports Metrics To Prometheus Server
[Documentation] Check the expected metrics are sent to the local server.
[Setup] Run Keywords
... Start Prometheus Server ${PROMETHEUS_PORT}
... AND
... Setup Telemetry Configuration ${ENABLE_TELEMETRY_TO_PROMETHUS} ${PULL_SECRET_METRICS}
[Setup] Setup Telemetry Configuration ${ENABLE_TELEMETRY_TO_PROMETHUS} ${PULL_SECRET_METRICS}

Should Find Metrics In Journal Log Success Metrics sent successfully

@{metrics_to_check}= Get List Prometheus Metrics To Check
FOR ${metric} IN @{metrics_to_check}
Check Prometheus Query ${PROMETHEUS_HOST} ${PROMETHEUS_PORT} ${metric}
Check Prometheus Query ${PROMETHEUS_HOST} ${PROMETHEUS_PORT} ${metric} add_hostname_filter=${False}
END

[Teardown] Run Keywords
... Remove Telemetry Configuration
... AND
... Stop Prometheus Server ${PROMETHEUS_PORT}
[Teardown] Remove Telemetry Configuration
Copy link
Contributor

Choose a reason for hiding this comment

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

This MicroShift Reports Metrics To Prometheus Server Test Case must be executed always in the last place in this Test Suite. If not, the other 2 Prometheus Test Cases will fail because they'll find metrics in the Prometheus server.
This is the reason why, in the original implementation, the Prometheus server starts and stops for every Test Case.

Copy link
Member Author

Choose a reason for hiding this comment

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

That would explain weird failure I've seen locally

@pmtk
Copy link
Member Author

pmtk commented Nov 27, 2025

/test all

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 27, 2025
@pmtk
Copy link
Member Author

pmtk commented Nov 27, 2025

/test all

@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 27, 2025
@pmtk
Copy link
Member Author

pmtk commented Nov 27, 2025

/test all

1 similar comment
@pmtk
Copy link
Member Author

pmtk commented Nov 27, 2025

/test all

@pmtk pmtk force-pushed the single-prom-loki branch from 6a61de6 to 2786b58 Compare December 2, 2025 15:17
@pmtk
Copy link
Member Author

pmtk commented Dec 2, 2025

/test all

@pmtk pmtk force-pushed the single-prom-loki branch from 2786b58 to 96ba780 Compare December 2, 2025 17:04
@pmtk
Copy link
Member Author

pmtk commented Dec 4, 2025

/retst

@pmtk
Copy link
Member Author

pmtk commented Dec 4, 2025

/retest

@ggiguash
Copy link
Contributor

ggiguash commented Dec 7, 2025

/test all

@ggiguash
Copy link
Contributor

ggiguash commented Dec 7, 2025

/retitle USHIFT-6338:Use single instances of Prometheus and Loki for all tests

@openshift-ci openshift-ci bot changed the title WIP Use single instances of Prometheus and Loki for all tests USHIFT-6338:Use single instances of Prometheus and Loki for all tests Dec 7, 2025
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Dec 7, 2025
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Dec 7, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Dec 7, 2025

@pmtk: This pull request references USHIFT-6338 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "4.21.0" version, but no target version was set.

Details

In response to this:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@pmtk
Copy link
Member Author

pmtk commented Dec 8, 2025

/retest

@pmtk pmtk changed the title USHIFT-6338:Use single instances of Prometheus and Loki for all tests USHIFT-6338: Use single instances of Prometheus and Loki for all tests Dec 8, 2025
@pmtk
Copy link
Member Author

pmtk commented Dec 9, 2025

/retest

Copy link
Contributor

@pacevedom pacevedom left a comment

Choose a reason for hiding this comment

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

/lgtm

@pmtk
Copy link
Member Author

pmtk commented Dec 9, 2025

/override ci/prow/e2e-aws-tests-bootc-periodic ci/prow/e2e-aws-tests-bootc-periodic-arm ci/prow/e2e-aws-tests-bootc-release ci/prow/e2e-aws-tests-bootc-release-arm ci/prow/e2e-aws-tests-periodic ci/prow/e2e-aws-tests-periodic-arm ci/prow/e2e-aws-tests-release ci/prow/e2e-aws-tests-release-arm

@pmtk
Copy link
Member Author

pmtk commented Dec 9, 2025

/verified by @pmtk

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Dec 9, 2025
@openshift-ci-robot
Copy link

@pmtk: This PR has been marked as verified by @pmtk.

Details

In response to this:

/verified by @pmtk

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 9, 2025
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 9, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: pacevedom, pmtk

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

The pull request process is described here

Details 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
Copy link
Contributor

openshift-ci bot commented Dec 9, 2025

@pmtk: Overrode contexts on behalf of pmtk: ci/prow/e2e-aws-tests-bootc-periodic, ci/prow/e2e-aws-tests-bootc-periodic-arm, ci/prow/e2e-aws-tests-bootc-release, ci/prow/e2e-aws-tests-bootc-release-arm, ci/prow/e2e-aws-tests-periodic, ci/prow/e2e-aws-tests-periodic-arm, ci/prow/e2e-aws-tests-release, ci/prow/e2e-aws-tests-release-arm

Details

In response to this:

/override ci/prow/e2e-aws-tests-bootc-periodic ci/prow/e2e-aws-tests-bootc-periodic-arm ci/prow/e2e-aws-tests-bootc-release ci/prow/e2e-aws-tests-bootc-release-arm ci/prow/e2e-aws-tests-periodic ci/prow/e2e-aws-tests-periodic-arm ci/prow/e2e-aws-tests-release ci/prow/e2e-aws-tests-release-arm

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@pmtk
Copy link
Member Author

pmtk commented Dec 9, 2025

/override ci/prow/e2e-aws-tests-bootc-periodic ci/prow/e2e-aws-tests-bootc-periodic-arm ci/prow/e2e-aws-tests-bootc-release ci/prow/e2e-aws-tests-bootc-release-arm ci/prow/e2e-aws-tests-periodic ci/prow/e2e-aws-tests-periodic-arm ci/prow/e2e-aws-tests-release ci/prow/e2e-aws-tests-release-arm ci/prow/e2e-aws-tests

ci/prow/e2e-aws-tests failure is unrelated

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 9, 2025

@pmtk: Overrode contexts on behalf of pmtk: ci/prow/e2e-aws-tests, ci/prow/e2e-aws-tests-bootc-periodic, ci/prow/e2e-aws-tests-bootc-periodic-arm, ci/prow/e2e-aws-tests-bootc-release, ci/prow/e2e-aws-tests-bootc-release-arm, ci/prow/e2e-aws-tests-periodic, ci/prow/e2e-aws-tests-periodic-arm, ci/prow/e2e-aws-tests-release, ci/prow/e2e-aws-tests-release-arm

Details

In response to this:

/override ci/prow/e2e-aws-tests-bootc-periodic ci/prow/e2e-aws-tests-bootc-periodic-arm ci/prow/e2e-aws-tests-bootc-release ci/prow/e2e-aws-tests-bootc-release-arm ci/prow/e2e-aws-tests-periodic ci/prow/e2e-aws-tests-periodic-arm ci/prow/e2e-aws-tests-release ci/prow/e2e-aws-tests-release-arm ci/prow/e2e-aws-tests

ci/prow/e2e-aws-tests failure is unrelated

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 070eb6d and 2 for PR HEAD 96ba780 in total

@ggiguash
Copy link
Contributor

ggiguash commented Dec 9, 2025

/test all

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 4ed4a53 and 1 for PR HEAD 96ba780 in total

@pmtk
Copy link
Member Author

pmtk commented Dec 10, 2025

/override ci/prow/e2e-aws-tests-bootc-periodic ci/prow/e2e-aws-tests-bootc-periodic-arm ci/prow/e2e-aws-tests-bootc-release ci/prow/e2e-aws-tests-bootc-release-arm ci/prow/e2e-aws-tests-periodic ci/prow/e2e-aws-tests-periodic-arm ci/prow/e2e-aws-tests-release ci/prow/e2e-aws-tests-release-arm

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 10, 2025

@pmtk: Overrode contexts on behalf of pmtk: ci/prow/e2e-aws-tests-bootc-periodic, ci/prow/e2e-aws-tests-bootc-periodic-arm, ci/prow/e2e-aws-tests-bootc-release, ci/prow/e2e-aws-tests-bootc-release-arm, ci/prow/e2e-aws-tests-periodic, ci/prow/e2e-aws-tests-periodic-arm, ci/prow/e2e-aws-tests-release, ci/prow/e2e-aws-tests-release-arm

Details

In response to this:

/override ci/prow/e2e-aws-tests-bootc-periodic ci/prow/e2e-aws-tests-bootc-periodic-arm ci/prow/e2e-aws-tests-bootc-release ci/prow/e2e-aws-tests-bootc-release-arm ci/prow/e2e-aws-tests-periodic ci/prow/e2e-aws-tests-periodic-arm ci/prow/e2e-aws-tests-release ci/prow/e2e-aws-tests-release-arm

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 10, 2025

@pmtk: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@openshift-merge-bot openshift-merge-bot bot merged commit c9cef3f into openshift:main Dec 10, 2025
19 checks passed
@pmtk pmtk deleted the single-prom-loki branch December 10, 2025 10:25
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. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants