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

Use default ES distribution for functional tests #88737

Merged
merged 2 commits into from
Feb 8, 2021

Conversation

tylersmalley
Copy link
Contributor

@tylersmalley tylersmalley commented Jan 19, 2021

Use the default Elasticsearch distribution across all functional and integration tests within Kibana.

@tylersmalley tylersmalley force-pushed the no-es-oss-builds branch 4 times, most recently from 76e0819 to 544de3d Compare January 19, 2021 20:59
@tylersmalley tylersmalley changed the title WIP Removes usage of OSS Elasticsearch builds Jan 19, 2021
@tylersmalley tylersmalley force-pushed the no-es-oss-builds branch 7 times, most recently from cbc8164 to 45c1941 Compare January 20, 2021 05:21
@tylersmalley tylersmalley changed the title Removes usage of OSS Elasticsearch builds Use default ES distribution for functional tests Jan 20, 2021
@tylersmalley tylersmalley force-pushed the no-es-oss-builds branch 7 times, most recently from 202d240 to 4d84523 Compare January 21, 2021 00:25
@tylersmalley tylersmalley added release_note:skip Skip the PR/issue when compiling release notes Team:Operations Team label for Operations Team v7.12.0 v8.0.0 labels Jan 21, 2021
@tylersmalley tylersmalley marked this pull request as ready for review January 21, 2021 05:02
@tylersmalley tylersmalley requested review from a team as code owners January 21, 2021 05:02
@elasticmachine
Copy link
Contributor

Pinging @elastic/kibana-operations (Team:Operations)

Copy link
Contributor

@spalger spalger left a comment

Choose a reason for hiding this comment

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

LGTM, but I would feel more comfortable if we got to the bottom of that lens assertion change.

@flash1293
Copy link
Contributor

@tylersmalley Seems like this PR will still run the tests in test/functional against a Kibana instance with only the plugin in src loaded while all x-pack plugins are not active. The isOss() check you removed in the scripted field test is about testing Lens, but Lens is not available for this test so visualize is opened instead. I guess for now we can just take the visualize branch (the one checking against inspector) and deleting the Lens branch.

Maybe I misunderstood something, but going forward I would expect all tests to run with all of the x-pack stuff present right (like a regular "basic" default distribution behaves as well)?

Copy link
Contributor

@mshustov mshustov left a comment

Choose a reason for hiding this comment

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

ok for the Core changes

@spalger
Copy link
Contributor

spalger commented Feb 8, 2021

@elasticmachine merge upstream

@tylersmalley tylersmalley added the auto-backport Deprecated - use backport:version if exact versions are needed label Feb 8, 2021
@kibanamachine
Copy link
Contributor

💚 Build Succeeded

Metrics [docs]

✅ unchanged

History

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

@tylersmalley tylersmalley merged commit b39ad86 into elastic:master Feb 8, 2021
@kibanamachine
Copy link
Contributor

Backport result

{"level":"info","message":"POST https://api.github.com/graphql (status: 200)"}
{"level":"info","message":"POST https://api.github.com/graphql (status: 200)"}
{"meta":{"labels":["Team:Operations","auto-backport","release_note:skip","v7.12.0","v8.0.0"],"branchLabelMapping":{"^v8.0.0$":"master","^v7.12.0$":"7.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"},"existingTargetPullRequests":[]},"level":"info","message":"Inputs when calculating target branches:"}
{"meta":["7.x"],"level":"info","message":"Target branches inferred from labels:"}
{"meta":{"killed":false,"code":2,"signal":null,"cmd":"git remote rm kibanamachine","stdout":"","stderr":"error: No such remote: 'kibanamachine'\n"},"level":"info","message":"exec error 'git remote rm kibanamachine':"}
{"meta":{"killed":false,"code":2,"signal":null,"cmd":"git remote rm elastic","stdout":"","stderr":"error: No such remote: 'elastic'\n"},"level":"info","message":"exec error 'git remote rm elastic':"}
{"level":"info","message":"Backporting [{\"sourceBranch\":\"master\",\"targetBranchesFromLabels\":[\"7.x\"],\"sha\":\"b39ad86b5d59fef96366affbdfbcc6758545cba9\",\"formattedMessage\":\"Use default ES distribution for functional tests (#88737)\",\"originalMessage\":\"Use default ES distribution for functional tests (#88737)\\n\\nSigned-off-by: Tyler Smalley <[email protected]>\\r\\n\\r\\nCo-authored-by: Kibana Machine <[email protected]>\",\"pullNumber\":88737,\"existingTargetPullRequests\":[]}] to 7.x"}

Backporting to 7.x:
{"level":"info","message":"Backporting via filesystem"}
{"meta":{"killed":false,"code":1,"signal":null,"cmd":"git cherry-pick b39ad86b5d59fef96366affbdfbcc6758545cba9","stdout":"Auto-merging test/functional/config.js\nAuto-merging test/common/config.js\nAuto-merging src/core/test_helpers/kbn_server.ts\nAuto-merging src/core/server/saved_objects/migrationsv2/integration_tests/migration.test.ts\nAuto-merging packages/kbn-test/src/legacy_es/legacy_es_test_cluster.js\nCONFLICT (modify/delete): .ci/packer_cache_for_branch.sh deleted in HEAD and modified in b39ad86b5d5 (Use default ES distribution for functional tests (#88737)). Version b39ad86b5d5 (Use default ES distribution for functional tests (#88737)) of .ci/packer_cache_for_branch.sh left in tree.\n","stderr":"error: could not apply b39ad86b5d5... Use default ES distribution for functional tests (#88737)\nhint: after resolving the conflicts, mark the corrected paths\nhint: with 'git add <paths>' or 'git rm <paths>'\nhint: and commit the result with 'git commit'\n"},"level":"info","message":"exec error 'git cherry-pick b39ad86b5d59fef96366affbdfbcc6758545cba9':"}
Commit could not be cherrypicked due to conflicts

tylersmalley pushed a commit to tylersmalley/kibana that referenced this pull request Feb 8, 2021
Signed-off-by: Tyler Smalley <[email protected]>

Co-authored-by: Kibana Machine <[email protected]>
# Conflicts:
#	.ci/packer_cache_for_branch.sh
tylersmalley pushed a commit that referenced this pull request Feb 9, 2021
Signed-off-by: Tyler Smalley <[email protected]>

Co-authored-by: Kibana Machine <[email protected]>
# Conflicts:
#	.ci/packer_cache_for_branch.sh
jloleysens added a commit to jloleysens/kibana that referenced this pull request Feb 9, 2021
…timeline-and-rollover-info

* 'master' of github.com:elastic/kibana: (47 commits)
  [Fleet] Use TS project references (elastic#87574)
  before/beforeEach clean up (elastic#90663)
  [Vega] user should be able to set a specific tilemap service using the mapStyle property (elastic#88440)
  [Security Solution][Case] ServiceNow SIR Connector (elastic#88655)
  [Search Sessions] Enable extend from management (elastic#90558)
  [ILM] Delete phase redesign (rework) (elastic#90291)
  [APM-UI][E2E] use withGithubStatus step (elastic#90651)
  Add folding in kb-monaco and update some viewers (elastic#90152)
  [Grok Debugger] Changed test to wait for grok debugger container to exist to fix test flakiness (elastic#90543)
  Strongly typed EUI theme for styled-components (elastic#90106)
  Fix vega renovate label (elastic#90591)
  [Uptime] Migrate to TypeScript project references (elastic#90510)
  [Monitoring] Migrate data source for legacy alerts to monitoring data directly (elastic#87377)
  [Upgrade Assistant] Add A11y Tests (elastic#90265)
  [Time to Visualize] Adds functional tests for linking/unlinking panel from embeddable library (elastic#89612)
  [dev-utils/ship-ci-stats] fail when CI stats is down (elastic#90678)
  chore(NA): remove write permissions on Bazel remote cache for PRs (elastic#90652)
  chore(NA): move bazel workspace status from bash script into nodejs executable (elastic#90560)
  Use default ES distribution for functional tests (elastic#88737)
  [Alerts] Jira: Disallow labels with spaces (elastic#90548)
  ...

# Conflicts:
#	x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/timeline/timeline.tsx
#	x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/lib/absolute_timing_to_relative_timing.test.ts
#	x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/lib/absolute_timing_to_relative_timing.ts
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
auto-backport Deprecated - use backport:version if exact versions are needed release_note:skip Skip the PR/issue when compiling release notes Team:Operations Team label for Operations Team v7.12.0 v8.0.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants