From 906f197948f54697c97ae8ff12151a21acc18122 Mon Sep 17 00:00:00 2001 From: "opensearch-trigger-bot[bot]" <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 18:49:59 +0800 Subject: [PATCH] [Backport 2.x] [MDS] add workspace tests with multiple data source enabled (#1353) (#1388) * [MDS] add workspace tests with multiple data source enabled (#1341) * [MDS] add workspace tests with multiple data source enabled Signed-off-by: yubonluo * update worksapce to support workspace Signed-off-by: yubonluo * update worksapce to support workspace Signed-off-by: yubonluo * optimize the code Signed-off-by: yubonluo * optimize the code Signed-off-by: yubonluo * update workflow Signed-off-by: yubonluo --------- Signed-off-by: yubonluo (cherry picked from commit c13164ac71aef256eec2fde8f62da847d5b95ae6) * Add dashboards admin for workspace MDS cases Signed-off-by: Lin Wang --------- Signed-off-by: Lin Wang Co-authored-by: yuboluo Co-authored-by: Anan Zhuang Co-authored-by: Lin Wang Co-authored-by: SuZhou-Joe (cherry picked from commit a7d3227f927e6bc4c5d10ca1ca8510eccef2e61b) Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com> Co-authored-by: SuZhou-Joe --- .github/workflows/workspace-release-e2e-workflow.yml | 9 +++++++++ ...space_create.spec.js => mds_workspace_create.spec.js} | 0 ..._menu.spec.js => mds_workspace_dropdown_menu.spec.js} | 0 ...e_overview.spec.js => mds_workspace_overview.spec.js} | 0 ...space_update.spec.js => mds_workspace_update.spec.js} | 0 5 files changed, 9 insertions(+) rename cypress/integration/core-opensearch-dashboards/opensearch-dashboards/workspace-plugin/{workspace_create.spec.js => mds_workspace_create.spec.js} (100%) rename cypress/integration/core-opensearch-dashboards/opensearch-dashboards/workspace-plugin/{workspace_dropdown_menu.spec.js => mds_workspace_dropdown_menu.spec.js} (100%) rename cypress/integration/core-opensearch-dashboards/opensearch-dashboards/workspace-plugin/{workspace_overview.spec.js => mds_workspace_overview.spec.js} (100%) rename cypress/integration/core-opensearch-dashboards/opensearch-dashboards/workspace-plugin/{workspace_update.spec.js => mds_workspace_update.spec.js} (100%) diff --git a/.github/workflows/workspace-release-e2e-workflow.yml b/.github/workflows/workspace-release-e2e-workflow.yml index c6066a2ed..913a9e56f 100644 --- a/.github/workflows/workspace-release-e2e-workflow.yml +++ b/.github/workflows/workspace-release-e2e-workflow.yml @@ -33,3 +33,12 @@ jobs: test-command: env CYPRESS_WORKSPACE_ENABLED=true yarn cypress:run-without-security --browser chromium --spec 'cypress/integration/core-opensearch-dashboards/opensearch-dashboards/workspace-plugin/*' osd-serve-args: --workspace.enabled=true --savedObjects.permission.enabled=false security-enabled: false + tests-with-multiple-data-source-and-disabled-local-cluster: + needs: changes + if: ${{ needs.changes.outputs.tests == 'true' }} + uses: ./.github/workflows/release-e2e-workflow-template.yml + with: + test-name: dashboards workspace + test-command: env CYPRESS_DISABLE_LOCAL_CLUSTER=true CYPRESS_DATASOURCE_MANAGEMENT_ENABLED=true CYPRESS_WORKSPACE_ENABLED=true CYPRESS_SAVED_OBJECTS_PERMISSION_ENABLED=true yarn cypress:run-with-security --browser chromium --spec 'cypress/integration/core-opensearch-dashboards/opensearch-dashboards/workspace-plugin/mds*.js' + osd-serve-args: --data_source.enabled=true --data_source.ssl.verificationMode=none --data_source.hideLocalCluster=true --workspace.enabled=true --savedObjects.permission.enabled=true --opensearch_security.multitenancy.enabled=false --opensearchDashboards.dashboardAdmin.users='["admin"]' + security-enabled: true diff --git a/cypress/integration/core-opensearch-dashboards/opensearch-dashboards/workspace-plugin/workspace_create.spec.js b/cypress/integration/core-opensearch-dashboards/opensearch-dashboards/workspace-plugin/mds_workspace_create.spec.js similarity index 100% rename from cypress/integration/core-opensearch-dashboards/opensearch-dashboards/workspace-plugin/workspace_create.spec.js rename to cypress/integration/core-opensearch-dashboards/opensearch-dashboards/workspace-plugin/mds_workspace_create.spec.js diff --git a/cypress/integration/core-opensearch-dashboards/opensearch-dashboards/workspace-plugin/workspace_dropdown_menu.spec.js b/cypress/integration/core-opensearch-dashboards/opensearch-dashboards/workspace-plugin/mds_workspace_dropdown_menu.spec.js similarity index 100% rename from cypress/integration/core-opensearch-dashboards/opensearch-dashboards/workspace-plugin/workspace_dropdown_menu.spec.js rename to cypress/integration/core-opensearch-dashboards/opensearch-dashboards/workspace-plugin/mds_workspace_dropdown_menu.spec.js diff --git a/cypress/integration/core-opensearch-dashboards/opensearch-dashboards/workspace-plugin/workspace_overview.spec.js b/cypress/integration/core-opensearch-dashboards/opensearch-dashboards/workspace-plugin/mds_workspace_overview.spec.js similarity index 100% rename from cypress/integration/core-opensearch-dashboards/opensearch-dashboards/workspace-plugin/workspace_overview.spec.js rename to cypress/integration/core-opensearch-dashboards/opensearch-dashboards/workspace-plugin/mds_workspace_overview.spec.js diff --git a/cypress/integration/core-opensearch-dashboards/opensearch-dashboards/workspace-plugin/workspace_update.spec.js b/cypress/integration/core-opensearch-dashboards/opensearch-dashboards/workspace-plugin/mds_workspace_update.spec.js similarity index 100% rename from cypress/integration/core-opensearch-dashboards/opensearch-dashboards/workspace-plugin/workspace_update.spec.js rename to cypress/integration/core-opensearch-dashboards/opensearch-dashboards/workspace-plugin/mds_workspace_update.spec.js