[esArchiver] drop support for --dir, use repo-relative paths instead #101345

spalger · 2021-06-03T22:31:06Z

We have recently been making changes to tests and found the location of esArchives to be very confusing, especially since the archive name empty_kibana resolves to different archives for different parts of the code base, and it's not clear where the archives are. Additionally, we want it to be easier to share archives across tests configs, so this change removes the concept of an esArchiver dir and instead requires that all calls to esArchiver APIs use repo-relative paths like so:

-      await esArchiver.load('discover');
+      await esArchiver.load('test/functional/fixtures/es_archiver/discover');

This should make it crystal clear to all readers where archives are in the repo and hopefully encourage most archives to move into a more central shared location where people can reuse certain useful archives.

elasticmachine · 2021-06-08T00:01:57Z

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

YulNaumenko

Alerting changes LGTM!

elasticmachine · 2021-06-08T00:32:29Z

Pinging @elastic/apm-ui (Team:apm)

…olute-test-archive-paths

mattkime

much needed! changes lgtm

spalger · 2021-06-08T15:25:39Z

@elasticmachine merge upstream

…olute-test-archive-paths

spalger · 2021-06-08T19:35:57Z

@elasticmachine merge upstream

XavierM

LGTM for security solution

kibanamachine · 2021-06-08T21:37:39Z

💚 Build Succeeded

Metrics [docs]

✅ unchanged

History

💔 Build #129916 failed 6ffb2ab
💚 Build #129894 succeeded c6fae66
💚 Build #129843 succeeded 07163ce
💔 Build #129818 failed e9b638f
💚 Build #129814 succeeded c3f86eb

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

kibanamachine · 2021-06-08T21:40:14Z

💔 Backport failed

Status	Branch	Result
❌	7.x	Commit could not be cherrypicked due to conflicts

To backport manually run:
node scripts/backport --pr 101345

…lastic#101345) Co-authored-by: spalger <spalger@users.noreply.github.com> # Conflicts: # test/api_integration/apis/suggestions/suggestions.js # test/functional/apps/discover/_large_string.ts # test/functional/apps/visualize/index.ts # x-pack/test/functional/apps/infra/feature_controls/logs_security.ts # x-pack/test/functional/apps/saved_objects_management/import_saved_objects_between_versions_6.x_7.x.ts # x-pack/test/functional/apps/upgrade_assistant/upgrade_assistant.ts

…stead (#101345) (#101676) * [esArchiver] drop support for --dir, use repo-relative paths instead (#101345) Co-authored-by: spalger <spalger@users.noreply.github.com> # Conflicts: # test/api_integration/apis/suggestions/suggestions.js # test/functional/apps/discover/_large_string.ts # test/functional/apps/visualize/index.ts # x-pack/test/functional/apps/infra/feature_controls/logs_security.ts # x-pack/test/functional/apps/saved_objects_management/import_saved_objects_between_versions_6.x_7.x.ts # x-pack/test/functional/apps/upgrade_assistant/upgrade_assistant.ts * convert references to `saved_objects/basic` archive * adapt other `saved_objects/*` archives * update management/saved_obejcts/relationships archives * replace old monitoring setup() usage * remove reference to `empty_kibana` archive Co-authored-by: spalger <spalger@users.noreply.github.com>

PR's merged after #101345 Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>

* master: (54 commits) Implement "select all" rules feature (elastic#100554) [ML] Remove script fields from the Anomaly detection alerting rule executor (elastic#101607) [Security solutions][Endpoint] Update event filtering texts (elastic#101563) [Enterprise Search] Mocks/tests tech debt - avoid hungry mocking (elastic#101107) [FTR] Updates esArchive paths [FTR] Updates esArchive paths [Security Solution][Detection Engine] Adds runtime field tests (elastic#101664) Added APM PHP agent to the list of agent names (elastic#101062) [CI] Restore old version_info behavior when .git directory is present (elastic#101642) [Fleet] Add fleet server telemetry (elastic#101400) [APM] Syncs agent config settings to APM Fleet policies (elastic#100744) [esArchiver] drop support for --dir, use repo-relative paths instead (elastic#101345) Revert "[xpack/test] restore incremental: false in ts project" [Security Solution] Remove Host Isolation feature flag (elastic#101655) [xpack/test] restore incremental: false in ts project [DOCS] Adds link to video landing page (elastic#101413) [ML] Move Index Data Visualizer into separate plugin (Part 1) (elastic#100922) Improve security plugin return types (elastic#101492) [ts] migrate `x-pack/test` to composite ts project (elastic#101441) [App Search] Updated Search UI to new URL (elastic#101320) ...

spalger force-pushed the implement/absolute-test-archive-paths branch 3 times, most recently from ccf1a43 to df6e744 Compare June 7, 2021 22:12

spalger added 2 commits June 7, 2021 15:17

[esArchiver] drop support for --dir, use repo-relative paths instead

f02a242

convert all esArchiver usage to root-relative paths

c8430bf

spalger force-pushed the implement/absolute-test-archive-paths branch from df6e744 to c8430bf Compare June 7, 2021 22:18

spalger added release_note:skip Skip the PR/issue when compiling release notes Team:Operations Team label for Operations Team Team:QA Team label for QA Team v7.14.0 v8.0.0 and removed Team:QA Team label for QA Team labels Jun 8, 2021

spalger marked this pull request as ready for review June 8, 2021 00:01

spalger requested a review from a team as a code owner June 8, 2021 00:01

spalger requested a review from a team June 8, 2021 00:01

spalger requested review from a team as code owners June 8, 2021 00:01

YulNaumenko approved these changes Jun 8, 2021

View reviewed changes

botelastic bot added the Team:APM All issues that need APM UI Team support label Jun 8, 2021

spalger added 2 commits June 8, 2021 07:10

Merge branch 'master' of github.com:elastic/kibana into implement/abs…

c3f86eb

…olute-test-archive-paths

remove last remaining esArchiver config usage

e9b638f

poffdeluxe approved these changes Jun 8, 2021

View reviewed changes

jbudz approved these changes Jun 8, 2021

View reviewed changes

mattkime approved these changes Jun 8, 2021

View reviewed changes

spalger enabled auto-merge (squash) June 8, 2021 15:17

spalger added the auto-backport Deprecated - use backport:version if exact versions are needed label Jun 8, 2021

kibanamachine and others added 2 commits June 8, 2021 11:25

Merge branch 'master' into implement/absolute-test-archive-paths

07163ce

Merge branch 'master' of github.com:elastic/kibana into implement/abs…

c6fae66

…olute-test-archive-paths

cavokz mentioned this pull request Jun 8, 2021

Fix integration tests spalger/kibana#35

Merged

Fix integration tests (#35)

6ffb2ab

Merge branch 'master' into implement/absolute-test-archive-paths

6c69c52

XavierM approved these changes Jun 8, 2021

View reviewed changes

spalger merged commit f466ebf into elastic:master Jun 8, 2021

spalger deleted the implement/absolute-test-archive-paths branch June 8, 2021 21:37

spalger mentioned this pull request Jun 8, 2021

[7.x] [esArchiver] drop support for --dir, use repo-relative paths instead (#101345) #101676

Merged

tylersmalley pushed a commit that referenced this pull request Jun 9, 2021

[FTR] Updates esArchive paths

aa8f7f3

PR's merged after #101345 Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>

tylersmalley pushed a commit that referenced this pull request Jun 9, 2021

[FTR] Updates esArchive paths

c225aaa

PR's merged after #101345 Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>

tylersmalley pushed a commit that referenced this pull request Jun 9, 2021

[FTR] Updates esArchive paths

982feab

PR's merged after #101345 Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>

tylersmalley pushed a commit that referenced this pull request Jun 9, 2021

[FTR] Updates esArchive paths

9838db3

PR's merged after #101345 Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>

cavokz mentioned this pull request Jun 9, 2021

Fix es_archives path #101737

Merged

spalger mentioned this pull request Jun 9, 2021

[kbnArchiver] convert archive names to root-relative paths #101839

Merged

cavokz mentioned this pull request Jun 14, 2021

[master] Fix esArchiver path in the Jenkins workspace #102095

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[esArchiver] drop support for --dir, use repo-relative paths instead #101345

[esArchiver] drop support for --dir, use repo-relative paths instead #101345

spalger commented Jun 3, 2021 •

edited

Loading

elasticmachine commented Jun 8, 2021

YulNaumenko left a comment

elasticmachine commented Jun 8, 2021

mattkime left a comment

spalger commented Jun 8, 2021

spalger commented Jun 8, 2021

XavierM left a comment

kibanamachine commented Jun 8, 2021

kibanamachine commented Jun 8, 2021

[esArchiver] drop support for --dir, use repo-relative paths instead #101345

[esArchiver] drop support for --dir, use repo-relative paths instead #101345

Conversation

spalger commented Jun 3, 2021 • edited Loading

elasticmachine commented Jun 8, 2021

YulNaumenko left a comment

Choose a reason for hiding this comment

elasticmachine commented Jun 8, 2021

mattkime left a comment

Choose a reason for hiding this comment

spalger commented Jun 8, 2021

spalger commented Jun 8, 2021

XavierM left a comment

Choose a reason for hiding this comment

kibanamachine commented Jun 8, 2021

💚 Build Succeeded

Metrics [docs]

History

kibanamachine commented Jun 8, 2021

💔 Backport failed

spalger commented Jun 3, 2021 •

edited

Loading