From 501ba8adf36f7de7f9481f6ab13efed9cf4b9abc Mon Sep 17 00:00:00 2001 From: Zhongnan Su Date: Thu, 11 May 2023 14:47:06 -0700 Subject: [PATCH] [CCI] Replace `node` with `scripts/use_node` in functional tests (#3783) (#3970) * Replace node with scripts/use_node (#3719) Co-authored-by: Sergey Myssak Signed-off-by: Andrey Myssak * Update CHANGELOG.md (#3719) Co-authored-by: Sergey Myssak Signed-off-by: Andrey Myssak --------- Signed-off-by: Andrey Myssak Co-authored-by: Sergey Myssak Co-authored-by: Josh Romero (cherry picked from commit 8f890e98f1af903a10b07ccb48065a9c843da990) Co-authored-by: Andrey Myssak <40265277+andreymyssak@users.noreply.github.com> --- .../plugins/osd_tp_run_pipeline/package.json | 4 ++-- .../plugins/app_link_test/package.json | 4 ++-- .../plugins/core_app_status/package.json | 4 ++-- .../plugins/core_plugin_a/package.json | 4 ++-- .../plugins/core_plugin_appleave/package.json | 4 ++-- .../plugins/core_plugin_b/package.json | 4 ++-- .../plugins/core_plugin_chromeless/package.json | 4 ++-- .../core_plugin_route_timeouts/package.json | 4 ++-- .../core_plugin_static_assets/package.json | 4 ++-- .../plugins/core_provider_plugin/package.json | 4 ++-- .../plugins/data_search/package.json | 4 ++-- .../plugins/doc_views_links_plugin/package.json | 17 +++++++++++++++++ .../plugins/doc_views_plugin/package.json | 4 ++-- .../plugins/index_patterns/package.json | 4 ++-- .../plugins/management_test_plugin/package.json | 4 ++-- .../opensearch_client_plugin/package.json | 4 ++-- .../osd_sample_panel_action/package.json | 4 ++-- .../plugins/osd_top_nav/package.json | 4 ++-- .../osd_tp_custom_visualizations/package.json | 4 ++-- .../plugins/rendering_plugin/package.json | 4 ++-- .../plugins/ui_settings_plugin/package.json | 4 ++-- 21 files changed, 57 insertions(+), 40 deletions(-) create mode 100644 test/plugin_functional/plugins/doc_views_links_plugin/package.json diff --git a/test/interpreter_functional/plugins/osd_tp_run_pipeline/package.json b/test/interpreter_functional/plugins/osd_tp_run_pipeline/package.json index 442778a7b9df..01276017fc83 100644 --- a/test/interpreter_functional/plugins/osd_tp_run_pipeline/package.json +++ b/test/interpreter_functional/plugins/osd_tp_run_pipeline/package.json @@ -8,8 +8,8 @@ }, "license": "Apache-2.0", "scripts": { - "osd": "node ../../../../scripts/osd.js", - "build": "node ../../../../scripts/remove.js './target' && tsc" + "osd": "../../../../scripts/use_node ../../../../scripts/osd.js", + "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc" }, "devDependencies": { "@elastic/eui": "29.3.2", diff --git a/test/plugin_functional/plugins/app_link_test/package.json b/test/plugin_functional/plugins/app_link_test/package.json index dd07b4de638c..c8be073d8c3c 100644 --- a/test/plugin_functional/plugins/app_link_test/package.json +++ b/test/plugin_functional/plugins/app_link_test/package.json @@ -8,8 +8,8 @@ }, "license": "Apache-2.0", "scripts": { - "osd": "node ../../../../scripts/osd.js", - "build": "node ../../../../scripts/remove.js './target' && tsc" + "osd": "../../../../scripts/use_node ../../../../scripts/osd.js", + "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc" }, "devDependencies": { "typescript": "4.0.2" diff --git a/test/plugin_functional/plugins/core_app_status/package.json b/test/plugin_functional/plugins/core_app_status/package.json index 524e33d8dfb2..95b0daea15c4 100644 --- a/test/plugin_functional/plugins/core_app_status/package.json +++ b/test/plugin_functional/plugins/core_app_status/package.json @@ -8,8 +8,8 @@ }, "license": "Apache-2.0", "scripts": { - "osd": "node ../../../../scripts/osd.js", - "build": "node ../../../../scripts/remove.js './target' && tsc" + "osd": "../../../../scripts/use_node ../../../../scripts/osd.js", + "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc" }, "devDependencies": { "typescript": "4.0.2" diff --git a/test/plugin_functional/plugins/core_plugin_a/package.json b/test/plugin_functional/plugins/core_plugin_a/package.json index b57d5783c77e..2f831305b1e1 100644 --- a/test/plugin_functional/plugins/core_plugin_a/package.json +++ b/test/plugin_functional/plugins/core_plugin_a/package.json @@ -8,8 +8,8 @@ }, "license": "Apache-2.0", "scripts": { - "osd": "node ../../../../scripts/osd.js", - "build": "node ../../../../scripts/remove.js './target' && tsc" + "osd": "../../../../scripts/use_node ../../../../scripts/osd.js", + "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc" }, "devDependencies": { "typescript": "4.0.2" diff --git a/test/plugin_functional/plugins/core_plugin_appleave/package.json b/test/plugin_functional/plugins/core_plugin_appleave/package.json index 5caa1a70f8d2..19a7cd5d3494 100644 --- a/test/plugin_functional/plugins/core_plugin_appleave/package.json +++ b/test/plugin_functional/plugins/core_plugin_appleave/package.json @@ -8,8 +8,8 @@ }, "license": "Apache-2.0", "scripts": { - "osd": "node ../../../../scripts/osd.js", - "build": "node ../../../../scripts/remove.js './target' && tsc" + "osd": "../../../../scripts/use_node ../../../../scripts/osd.js", + "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc" }, "devDependencies": { "typescript": "4.0.2" diff --git a/test/plugin_functional/plugins/core_plugin_b/package.json b/test/plugin_functional/plugins/core_plugin_b/package.json index d37ffd582e6d..12f9699d0a05 100644 --- a/test/plugin_functional/plugins/core_plugin_b/package.json +++ b/test/plugin_functional/plugins/core_plugin_b/package.json @@ -8,8 +8,8 @@ }, "license": "Apache-2.0", "scripts": { - "osd": "node ../../../../scripts/osd.js", - "build": "node ../../../../scripts/remove.js './target' && tsc" + "osd": "../../../../scripts/use_node ../../../../scripts/osd.js", + "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc" }, "devDependencies": { "typescript": "4.0.2" diff --git a/test/plugin_functional/plugins/core_plugin_chromeless/package.json b/test/plugin_functional/plugins/core_plugin_chromeless/package.json index 0c444aaf80ca..3eb544b8d0c3 100644 --- a/test/plugin_functional/plugins/core_plugin_chromeless/package.json +++ b/test/plugin_functional/plugins/core_plugin_chromeless/package.json @@ -8,8 +8,8 @@ }, "license": "Apache-2.0", "scripts": { - "osd": "node ../../../../scripts/osd.js", - "build": "node ../../../../scripts/remove.js './target' && tsc" + "osd": "../../../../scripts/use_node ../../../../scripts/osd.js", + "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc" }, "devDependencies": { "typescript": "4.0.2" diff --git a/test/plugin_functional/plugins/core_plugin_route_timeouts/package.json b/test/plugin_functional/plugins/core_plugin_route_timeouts/package.json index 1b03b60ad387..d1991597424f 100644 --- a/test/plugin_functional/plugins/core_plugin_route_timeouts/package.json +++ b/test/plugin_functional/plugins/core_plugin_route_timeouts/package.json @@ -8,8 +8,8 @@ }, "license": "Apache-2.0", "scripts": { - "osd": "node ../../../../scripts/osd.js", - "build": "node ../../../../scripts/remove.js './target' && tsc" + "osd": "../../../../scripts/use_node ../../../../scripts/osd.js", + "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc" }, "devDependencies": { "typescript": "4.0.2" diff --git a/test/plugin_functional/plugins/core_plugin_static_assets/package.json b/test/plugin_functional/plugins/core_plugin_static_assets/package.json index e44a09af12cb..72b66daa5682 100644 --- a/test/plugin_functional/plugins/core_plugin_static_assets/package.json +++ b/test/plugin_functional/plugins/core_plugin_static_assets/package.json @@ -8,8 +8,8 @@ }, "license": "Apache-2.0", "scripts": { - "osd": "node ../../../../scripts/osd.js", - "build": "node ../../../../scripts/remove.js './target' && tsc" + "osd": "../../../../scripts/use_node ../../../../scripts/osd.js", + "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc" }, "devDependencies": { "typescript": "4.0.2" diff --git a/test/plugin_functional/plugins/core_provider_plugin/package.json b/test/plugin_functional/plugins/core_provider_plugin/package.json index 778d9363e71d..7e1ebbf6a0da 100644 --- a/test/plugin_functional/plugins/core_provider_plugin/package.json +++ b/test/plugin_functional/plugins/core_provider_plugin/package.json @@ -8,8 +8,8 @@ }, "license": "Apache-2.0", "scripts": { - "osd": "node ../../../../scripts/osd.js", - "build": "node ../../../../scripts/remove.js './target' && tsc" + "osd": "../../../../scripts/use_node ../../../../scripts/osd.js", + "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc" }, "devDependencies": { "typescript": "4.0.2" diff --git a/test/plugin_functional/plugins/data_search/package.json b/test/plugin_functional/plugins/data_search/package.json index 056a79f2139a..fd29f04b17df 100644 --- a/test/plugin_functional/plugins/data_search/package.json +++ b/test/plugin_functional/plugins/data_search/package.json @@ -6,8 +6,8 @@ }, "license": "Apache-2.0", "scripts": { - "osd": "node ../../../../scripts/osd.js", - "build": "node ../../../../scripts/remove.js './target' && tsc" + "osd": "../../../../scripts/use_node ../../../../scripts/osd.js", + "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc" }, "devDependencies": { "typescript": "4.0.2" diff --git a/test/plugin_functional/plugins/doc_views_links_plugin/package.json b/test/plugin_functional/plugins/doc_views_links_plugin/package.json new file mode 100644 index 000000000000..fdd7e77e30b8 --- /dev/null +++ b/test/plugin_functional/plugins/doc_views_links_plugin/package.json @@ -0,0 +1,17 @@ +{ + "name": "docViewLinksPlugin", + "version": "1.0.0", + "main": "target/test/plugin_functional/plugins/doc_views_links_plugin", + "opensearchDashboards": { + "version": "opensearchDashboards", + "templateVersion": "1.0.0" + }, + "license": "Apache-2.0", + "scripts": { + "osd": "../../../../scripts/use_node ../../../../scripts/osd.js", + "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc" + }, + "devDependencies": { + "typescript": "4.0.2" + } +} diff --git a/test/plugin_functional/plugins/doc_views_plugin/package.json b/test/plugin_functional/plugins/doc_views_plugin/package.json index 67018cec9d95..27cc089d2398 100644 --- a/test/plugin_functional/plugins/doc_views_plugin/package.json +++ b/test/plugin_functional/plugins/doc_views_plugin/package.json @@ -8,8 +8,8 @@ }, "license": "Apache-2.0", "scripts": { - "osd": "node ../../../../scripts/osd.js", - "build": "node ../../../../scripts/remove.js './target' && tsc" + "osd": "../../../../scripts/use_node ../../../../scripts/osd.js", + "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc" }, "devDependencies": { "typescript": "4.0.2" diff --git a/test/plugin_functional/plugins/index_patterns/package.json b/test/plugin_functional/plugins/index_patterns/package.json index 3b88f3bf3932..b5d5bb239645 100644 --- a/test/plugin_functional/plugins/index_patterns/package.json +++ b/test/plugin_functional/plugins/index_patterns/package.json @@ -8,8 +8,8 @@ }, "license": "Apache-2.0", "scripts": { - "osd": "node ../../../../scripts/osd.js", - "build": "node ../../../../scripts/remove.js './target' && tsc" + "osd": "../../../../scripts/use_node ../../../../scripts/osd.js", + "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc" }, "devDependencies": { "typescript": "4.0.2" diff --git a/test/plugin_functional/plugins/management_test_plugin/package.json b/test/plugin_functional/plugins/management_test_plugin/package.json index b20971f403aa..ab3107b24b93 100644 --- a/test/plugin_functional/plugins/management_test_plugin/package.json +++ b/test/plugin_functional/plugins/management_test_plugin/package.json @@ -8,8 +8,8 @@ }, "license": "Apache-2.0", "scripts": { - "osd": "node ../../../../scripts/osd.js", - "build": "node ../../../../scripts/remove.js './target' && tsc" + "osd": "../../../../scripts/use_node ../../../../scripts/osd.js", + "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc" }, "devDependencies": { "typescript": "4.0.2" diff --git a/test/plugin_functional/plugins/opensearch_client_plugin/package.json b/test/plugin_functional/plugins/opensearch_client_plugin/package.json index 77d31a85f8f5..0770ca4334c7 100644 --- a/test/plugin_functional/plugins/opensearch_client_plugin/package.json +++ b/test/plugin_functional/plugins/opensearch_client_plugin/package.json @@ -6,8 +6,8 @@ }, "license": "Apache-2.0", "scripts": { - "osd": "node ../../../../scripts/osd.js", - "build": "node ../../../../scripts/remove.js './target' && tsc" + "osd": "../../../../scripts/use_node ../../../../scripts/osd.js", + "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc" }, "devDependencies": { "typescript": "4.0.2" diff --git a/test/plugin_functional/plugins/osd_sample_panel_action/package.json b/test/plugin_functional/plugins/osd_sample_panel_action/package.json index afb904c8e2d7..a48ddedb1a8a 100644 --- a/test/plugin_functional/plugins/osd_sample_panel_action/package.json +++ b/test/plugin_functional/plugins/osd_sample_panel_action/package.json @@ -8,8 +8,8 @@ }, "license": "Apache-2.0", "scripts": { - "osd": "node ../../../../scripts/osd.js", - "build": "node ../../../../scripts/remove.js './target' && tsc" + "osd": "../../../../scripts/use_node ../../../../scripts/osd.js", + "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc" }, "devDependencies": { "@elastic/eui": "29.3.2", diff --git a/test/plugin_functional/plugins/osd_top_nav/package.json b/test/plugin_functional/plugins/osd_top_nav/package.json index a1a244da27cd..bceb4a94defd 100644 --- a/test/plugin_functional/plugins/osd_top_nav/package.json +++ b/test/plugin_functional/plugins/osd_top_nav/package.json @@ -8,8 +8,8 @@ }, "license": "Apache-2.0", "scripts": { - "osd": "node ../../../../scripts/osd.js", - "build": "node ../../../../scripts/remove.js './target' && tsc" + "osd": "../../../../scripts/use_node ../../../../scripts/osd.js", + "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc" }, "devDependencies": { "typescript": "4.0.2" diff --git a/test/plugin_functional/plugins/osd_tp_custom_visualizations/package.json b/test/plugin_functional/plugins/osd_tp_custom_visualizations/package.json index 7e49a188da55..2588ca7c5d09 100644 --- a/test/plugin_functional/plugins/osd_tp_custom_visualizations/package.json +++ b/test/plugin_functional/plugins/osd_tp_custom_visualizations/package.json @@ -8,8 +8,8 @@ }, "license": "Apache-2.0", "scripts": { - "osd": "node ../../../../scripts/osd.js", - "build": "node ../../../../scripts/remove.js './target' && tsc" + "osd": "../../../../scripts/use_node ../../../../scripts/osd.js", + "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc" }, "devDependencies": { "@elastic/eui": "29.3.2", diff --git a/test/plugin_functional/plugins/rendering_plugin/package.json b/test/plugin_functional/plugins/rendering_plugin/package.json index 2548cfef508e..f9a3a284bc41 100644 --- a/test/plugin_functional/plugins/rendering_plugin/package.json +++ b/test/plugin_functional/plugins/rendering_plugin/package.json @@ -8,8 +8,8 @@ }, "license": "Apache-2.0", "scripts": { - "osd": "node ../../../../scripts/osd.js", - "build": "node ../../../../scripts/remove.js './target' && tsc" + "osd": "../../../../scripts/use_node ../../../../scripts/osd.js", + "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc" }, "devDependencies": { "typescript": "4.0.2" diff --git a/test/plugin_functional/plugins/ui_settings_plugin/package.json b/test/plugin_functional/plugins/ui_settings_plugin/package.json index db9bedec26d0..c290ee995d13 100644 --- a/test/plugin_functional/plugins/ui_settings_plugin/package.json +++ b/test/plugin_functional/plugins/ui_settings_plugin/package.json @@ -8,8 +8,8 @@ }, "license": "Apache-2.0", "scripts": { - "osd": "node ../../../../scripts/osd.js", - "build": "node ../../scripts/remove.js './target' && tsc" + "osd": "../../../../scripts/use_node ../../../../scripts/osd.js", + "build": "../../../../scripts/use_node ../../scripts/remove.js './target' && tsc" }, "devDependencies": { "typescript": "4.0.2"