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

Adding a ginkgo version of monitoring e2e test #5332

Merged
merged 3 commits into from
Mar 12, 2015

Conversation

vishh
Copy link
Contributor

@vishh vishh commented Mar 11, 2015

This e2e is more detailed than its shell counterpart. This PR removes the shell based monitoring e2e test.

Fixes #5212 #4186

@vishh
Copy link
Contributor Author

vishh commented Mar 11, 2015

@zmerlynn: I have enabled monitoring by default for e2e as well. Can you confirm that the changes in this PR will work for GKE based e2e clusters as well?

@vishh vishh added this to the v1.0 milestone Mar 11, 2015
@zmerlynn
Copy link
Member

@vishh: This isn't enough for GKE (we don't use config-test.sh / config-default.sh, we basically only use configure-vm.sh now, once I finish my changes.)

But furthermore, I think you may just need to conditionalize the test on provider == gce anyways?

@vishh
Copy link
Contributor Author

vishh commented Mar 11, 2015

@zmerlynn: Both of your comments are valid. I have updated the test to only look for the monitoring pods. The test will also run only on GCE.

@vishh vishh added the priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. label Mar 12, 2015
influxdbPW = "root"
podlistQuery = "select distinct(pod) from stats"
nodelistQuery = "select distinct(hostname) from machine"
sleepBetweenAttempts = 30 * time.Second
Copy link
Contributor

Choose a reason for hiding this comment

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

Seems a bit long, can we make it 5s? Is there a downside to do it more often?

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 reduced the timeout to 5 minutes and sleep duration to 10s. If this test is run as soon as the cluster is setup, it can take some time for the pods to be active.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Also once I implement the wait for pods to be running, this timeout can be reduced to a minute.

@vishh
Copy link
Contributor Author

vishh commented Mar 12, 2015

@vmarmol: Thanks for the review. Addressed your comments.

@vmarmol
Copy link
Contributor

vmarmol commented Mar 12, 2015

LGTM

vmarmol added a commit that referenced this pull request Mar 12, 2015
Adding a ginkgo version of monitoring e2e test
@vmarmol vmarmol merged commit c03b080 into kubernetes:master Mar 12, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Monitoring.sh appears to not test everything...
4 participants