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.

Sign up for GitHub

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

Jump to bottom

Fixed Monitoring Integration Tests #4699

Merged
merged 1 commit into from Mar 10, 2020
Merged

Fixed Monitoring Integration Tests #4699

merged 1 commit into from Mar 10, 2020

Conversation

dtaylor113
Copy link
Contributor

@dtaylor113 dtaylor113 commented Mar 9, 2020 •
edited

Updated monitoring and alertmanager integration suits to only work with test Receivers created in the tests.

@openshift-ci-robot openshift-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Mar 9, 2020
@dtaylor113 dtaylor113 force-pushed the disable-monitoring-integration-tests branch from 14267a7 to 1a225ab Compare March 9, 2020 18:16
@dtaylor113
Copy link
Contributor Author

/retest

@dtaylor113 dtaylor113 force-pushed the disable-monitoring-integration-tests branch from 1a225ab to 7960eb6 Compare March 9, 2020 19:54
@openshift-ci-robot openshift-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Mar 9, 2020
spadgett
spadgett reviewed Mar 9, 2020
View reviewed changes
frontend/integration-tests/views/monitoring.view.ts
@@ -69,16 +69,36 @@ export const saveAsDefault = firstElementByTestID('save-as-default');

export const defaultAlertmanagerYaml = Base64.encode(`"global":
"resolve_timeout": "5m"
"inhibit_rules":
Copy link
Member

@spadgett spadgett Mar 9, 2020 •
edited

Choose a reason for hiding this comment

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

OK as a follow on, but we should read the initial config from the cluster instead of hard-coding here. We do this for the OAuth scenario:

https://github.com/openshift/console/blob/master/frontend/integration-tests/tests/oauth.scenario.ts#L10-L20

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ok, but I believe the initial alertmanager conifg gets overwritten after updating the alertmanager Secret.

Copy link
Member

Choose a reason for hiding this comment

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

Ok, but I believe the initial alertmanager conifg gets overwritten after updating the alertmanager Secret.

beforeAll will read it before any tests are run

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I believe once you update the alert-main Secret with an updated alertmanager.yaml it overwrites the initial alertmanager config. I'm not sure there is a way to get what the original was.

Copy link
Member

Choose a reason for hiding this comment

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

Right, that's why you read the initial config before updating the secret :)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ah, read and save and restore on beforeAll -got it :-)

@dtaylor113 dtaylor113 force-pushed the disable-monitoring-integration-tests branch 2 times, most recently from d180f27 to f52bb48 Compare March 9, 2020 20:42
@openshift-ci-robot openshift-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Mar 9, 2020
@dtaylor113
Copy link
Contributor Author

@spadgett Fixed monitoring and alertmanager integration tests

@dtaylor113 dtaylor113 force-pushed the disable-monitoring-integration-tests branch from f52bb48 to 0432846 Compare March 9, 2020 20:46
@openshift-ci-robot openshift-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Mar 9, 2020
@dtaylor113 dtaylor113 changed the title Disable Monitoring Integration Tests Fixed Monitoring Integration Tests Mar 9, 2020
@dtaylor113 dtaylor113 force-pushed the disable-monitoring-integration-tests branch from 0432846 to a6c13e7 Compare March 9, 2020 20:52
spadgett
spadgett approved these changes Mar 10, 2020
View reviewed changes
Copy link
Member

@spadgett spadgett left a comment

Choose a reason for hiding this comment

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

/approve
/lgtm

thanks @dtaylor113 👍

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Mar 10, 2020
@spadgett
Copy link
Member

/retest

@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dtaylor113, spadgett

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-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 10, 2020
@spadgett spadgett mentioned this pull request Mar 10, 2020
Merged
@dtaylor113
Copy link
Contributor Author

/retest

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit 1b3230c into openshift:master Mar 10, 2020
@spadgett spadgett added this to the v4.5 milestone Mar 18, 2020
@dtaylor113 dtaylor113 deleted the disable-monitoring-integration-tests branch April 27, 2020 14:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@spadgett spadgett spadgett approved these changes

@benjaminapetersen benjaminapetersen Awaiting requested review from benjaminapetersen

@jcaianirh jcaianirh Awaiting requested review from jcaianirh

Assignees

@spadgett spadgett

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
v4.5
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@dtaylor113 @spadgett @openshift-ci-robot @openshift-bot @openshift-merge-robot