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

[Rollup] Fix flaky test when deleting Jobs #33231

Merged
merged 7 commits into from Mar 14, 2019

Conversation

Projects
None yet
5 participants
@sebelga
Copy link
Contributor

sebelga commented Mar 14, 2019

This PR fixes the flaky test when trying to delete a job that isn't yet in a "stopped" state.

The code had been reviewed and approved (#32884), the only part that has changed is the

waitForJobsToStop()

method added in the rollup.test_helpers.js file.

The fix has been applied on a branch created by @spalger that modifies those 3 files:

  • ci/jobs.yml
  • setup_mocha.js
  • jenkins_ci_group.sh ⚠️There was a merge conflict that I resolved in my last commit. Please double check that I resolved it the correct way 😊

spalger and others added some commits Mar 13, 2019

Merge branch 'master' into resubmit/32884
# Conflicts:
#	test/scripts/jenkins_ci_group.sh
@elasticmachine

This comment has been minimized.

Copy link

elasticmachine commented Mar 14, 2019

@sebelga

This comment has been minimized.

Copy link
Contributor Author

sebelga commented Mar 14, 2019

retest

@elasticmachine

This comment has been minimized.

Copy link

elasticmachine commented Mar 14, 2019

@sebelga sebelga requested review from spalger and bmcconaghy Mar 14, 2019

@elasticmachine

This comment has been minimized.

Copy link

elasticmachine commented Mar 14, 2019

@sebelga

This comment has been minimized.

Copy link
Contributor Author

sebelga commented Mar 14, 2019

retest

@elasticmachine

This comment has been minimized.

Copy link

elasticmachine commented Mar 14, 2019

@bmcconaghy
Copy link
Contributor

bmcconaghy left a comment

LGTM

Show resolved Hide resolved .ci/jobs.yml Outdated
@elasticmachine

This comment has been minimized.

Copy link

elasticmachine commented Mar 14, 2019

@sebelga

This comment has been minimized.

Copy link
Contributor Author

sebelga commented Mar 14, 2019

@tylersmalley I reverted all changes on files not from rollup api test. Can you have another look? cheers!

@elasticmachine

This comment has been minimized.

Copy link

elasticmachine commented Mar 14, 2019

@sebelga sebelga merged commit a9e6510 into elastic:master Mar 14, 2019

2 checks passed

CLA All commits in pull request signed
Details
kibana-ci Build finished.
Details

@sebelga sebelga deleted the sebelga:resubmit/32884 branch Mar 14, 2019

sebelga added a commit to sebelga/kibana that referenced this pull request Mar 14, 2019

@tylersmalley

This comment has been minimized.

Copy link
Member

tylersmalley commented Mar 14, 2019

@sebelga can you also make sure to add the necessary labels to this PR, including the version which it should target, release notes, and team. Thanks

I believe it would be the following, though not sure if it should be backported further to resolve any flakyness:

  • 8.0.0
  • 7.1.0
  • non-issue
  • :Elasticsearch UI

sebelga added a commit that referenced this pull request Mar 14, 2019

@elasticmachine

This comment has been minimized.

Copy link

elasticmachine commented Mar 15, 2019

Pinging @elastic/es-ui

@sebelga

This comment has been minimized.

Copy link
Contributor Author

sebelga commented Mar 15, 2019

Thanks @tylersmalley, just added the labels

spalger added a commit that referenced this pull request Mar 15, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.