From 9467c131e091bc6b6cecb2f77f0e4fd64e363c5b Mon Sep 17 00:00:00 2001
From: Sean Li <lnse@amazon.com>
Date: Thu, 20 Feb 2025 12:01:05 -0800
Subject: [PATCH] simplifies workflow, update run command

Signed-off-by: Sean Li <lnse@amazon.com>
---
 .../workflows/cypress_workflow_with_s3.yml    | 25 +++++--------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/cypress_workflow_with_s3.yml b/.github/workflows/cypress_workflow_with_s3.yml
index 7b86c93817d..ad02ee8db9f 100644
--- a/.github/workflows/cypress_workflow_with_s3.yml
+++ b/.github/workflows/cypress_workflow_with_s3.yml
@@ -10,17 +10,12 @@ on:
       - 'changelogs/fragments/**'
   workflow_dispatch:
     inputs:
-      test_repo:
-        description: 'Cypress test repo'
-        default: 'opensearch-project/opensearch-dashboards-functional-test'
-        required: true
-        type: string
       test_branch:
         description: 'Cypress test branch (default: source branch)'
         required: false
         type: string
       specs:
-        description: 'Tests to run (default: osd:ciGroup10)'
+        description: 'Tests to run'
         required: false
         type: string
       pr_number:
@@ -29,7 +24,6 @@ on:
         type: number
 
 env:
-  TEST_REPO: ${{ inputs.test_repo != '' && inputs.test_repo || 'opensearch-project/opensearch-dashboards-functional-test' }}
   TEST_BRANCH: "${{ inputs.test_branch != '' && inputs.test_branch || github.base_ref }}"
   FTR_PATH: 'ftr'
   CYPRESS_BROWSER: 'chromium'
@@ -49,7 +43,7 @@ jobs:
     env:
       START_CMD: 'node scripts/opensearch_dashboards --dev --no-base-path --no-watch --savedObjects.maxImportPayloadBytes=10485760 --server.maxPayloadBytes=1759977 --logging.json=false --data.search.aggs.shardDelay.enabled=true --csp.warnLegacyBrowsers=false --uiSettings.overrides["query:enhancements:enabled"]=true --uiSettings.overrides[''home:useNewHomePage'']=true --data_source.enabled=true --workspace.enabled=true --opensearch.ignoreVersionMismatch=true'
       OPENSEARCH_SNAPSHOT_CMD: '/bin/bash -c "./opensearch-2.17.0/opensearch-tar-install.sh &"'
-    name: Run cypress tests (osd:ciGroup10)
+    name: Run cypress tests with S3
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
@@ -71,18 +65,11 @@ jobs:
       - name: Build plugins
         run: node scripts/build_opensearch_dashboards_platform_plugins --no-examples --workers 12
 
-      - name: Checkout FT repo
-        uses: actions/checkout@v2
-        with:
-          path: ${{ env.FTR_PATH }}
-          repository: ${{ env.TEST_REPO }}
-          ref: '${{ env.TEST_BRANCH }}'
-
       - name: Setup spec files
         if: ${{ inputs.specs == '' }}
         shell: bash
         run: |
-          DASHBOARDS_SPEC="$(yarn --silent osd:ciGroup10)"
+          DASHBOARDS_SPEC="cypress/integration/core_opensearch_dashboards/opensearch_dashboards/apps/query_enhancements/s3_dataset.spec.js"
           echo "DASHBOARDS_SPEC=${DASHBOARDS_SPEC}" >> $GITHUB_ENV
           echo "DASHBOARDS_SPEC=${DASHBOARDS_SPEC}"
 
@@ -127,7 +114,7 @@ jobs:
         if: failure()
         uses: actions/upload-artifact@v4
         with:
-          name: dashboards-cypress-screenshots-10
+          name: dashboards-cypress-screenshots-s3
           path: cypress/screenshots
           retention-days: 1
           overwrite: true
@@ -136,7 +123,7 @@ jobs:
         uses: actions/upload-artifact@v4
         if: failure()
         with:
-          name: dashboards-cypress-videos-10
+          name: dashboards-cypress-videos-s3
           path: cypress/videos
           retention-days: 1
           overwrite: true
@@ -145,7 +132,7 @@ jobs:
         uses: actions/upload-artifact@v4
         if: always()
         with:
-          name: dashboards-cypress-results-10
+          name: dashboards-cypress-results-s3
           path: cypress/results
           retention-days: 1
           overwrite: true