[Revert][Tests] Add Github workflow for Test Orchestrator in FT Repo …

…to run cypress tests within Dashboards repo and Rename cypress config file to its version supported convention (#6166) * Revert "Rename cypress config file to its version supported convention (#6137) (#6141)" This reverts commit ed2e38d. * Revert "[Tests] Add Github workflow for Test Orchestrator in FT Repo to run cypress tests within Dashboards repo (#5725) (#6095)" This reverts commit 385fce4. Signed-off-by: Manasvini B Suryanarayana <[email protected]> --------- Signed-off-by: Manasvini B Suryanarayana <[email protected]>
opensearch-project · Mar 15, 2024 · b8e1c27 · b8e1c27
1 parent 458e108
commit b8e1c27
Show file tree

Hide file tree

Showing 11 changed files with 33 additions and 922 deletions.
diff --git a/.github/workflows/dashboards_cypress_workflow.yml b/.github/workflows/dashboards_cypress_workflow.yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -94,7 +94,6 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - [CI] Enable inputs for manually triggered Cypress test jobs ([#5134](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/5134))
 - [CI] Replace usage of deprecated `set-output` in workflows ([#5340](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/5340))
 - [Chore] Add `--security` for `opensearch snapshot` and `opensearch_dashboards` to configure local setup with the security plugin ([#5451](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/5451))
-- [Tests] Add Github workflow for Test Orchestrator in FT Repo to run cypress tests within Dashboards repo ([#5725](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/5725))
 - [Chore] Updates default dev environment security credentials ([#5736](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/5736))
 
 ### 📝 Documentation

diff --git a/cypress.json b/cypress.json
diff --git a/cypress/integration/core_opensearch_dashboards/dashboard_sanity_test_spec.js b/cypress/integration/core_opensearch_dashboards/dashboard_sanity_test_spec.js
diff --git a/package.json b/package.json
@@ -75,10 +75,7 @@
     "docs:acceptApiChanges": "scripts/use_node --max-old-space-size=6144 scripts/check_published_api_changes.js --accept",
     "osd:bootstrap": "scripts/use_node scripts/build_ts_refs && scripts/use_node scripts/register_git_hook",
     "spec_to_console": "scripts/use_node scripts/spec_to_console",
-    "pkg-version": "scripts/use_node -e \"console.log(require('./package.json').version)\"",
-    "cypress:run-without-security": "env TZ=America/Los_Angeles NO_COLOR=1 cypress run --headless --env SECURITY_ENABLED=false",
-    "cypress:run-with-security": "env TZ=America/Los_Angeles NO_COLOR=1 cypress run --headless --env SECURITY_ENABLED=true,openSearchUrl=https://localhost:9200,WAIT_FOR_LOADER_BUFFER_MS=500"
-
+    "pkg-version": "scripts/use_node -e \"console.log(require('./package.json').version)\""
   },
   "repository": {
     "type": "git",
@@ -233,9 +230,7 @@
     "type-detect": "^4.0.8",
     "uuid": "3.3.2",
     "whatwg-fetch": "^3.0.0",
-    "yauzl": "^2.10.0",
-    "@opensearch-dashboards-test/opensearch-dashboards-test-library": "https://github.com/opensearch-project/opensearch-dashboards-test-library/archive/refs/tags/1.0.6.tar.gz"
-
+    "yauzl": "^2.10.0"
   },
   "devDependencies": {
     "@babel/core": "^7.22.9",
@@ -364,7 +359,6 @@
     "chromedriver": "^107.0.3",
     "classnames": "2.3.1",
     "compare-versions": "3.5.1",
-    "cypress": "9.5.4",
     "d3": "3.5.17",
     "d3-cloud": "1.2.5",
     "dedent": "^0.7.0",

diff --git a/...s/common/opensearch_dashboards_service.sh → scripts/bwc/opensearch_dashboards_service.sh b/...s/common/opensearch_dashboards_service.sh → scripts/bwc/opensearch_dashboards_service.sh
diff --git a/scripts/common/opensearch_service.sh → scripts/bwc/opensearch_service.sh b/scripts/common/opensearch_service.sh → scripts/bwc/opensearch_service.sh
diff --git a/scripts/common/utils.sh → scripts/bwc/utils.sh b/scripts/common/utils.sh → scripts/bwc/utils.sh
diff --git a/scripts/bwctest_osd.sh b/scripts/bwctest_osd.sh
@@ -5,9 +5,9 @@
 
 set -e
 
-. scripts/common/utils.sh
-. scripts/common/opensearch_service.sh
-. scripts/common/opensearch_dashboards_service.sh
+. scripts/bwc/utils.sh
+. scripts/bwc/opensearch_service.sh
+. scripts/bwc/opensearch_dashboards_service.sh
 . scripts/bwc/generate_test_data.sh
 
 # For every release, add sample data and new version below: