Fix duplicate test cypress result name (#1624)

* Fix duplicate test cypress result name Signed-off-by: Lin Wang <[email protected]> * Rerun ci groups after base template updated Signed-off-by: Lin Wang <[email protected]> * Fix invalid characters in test name Signed-off-by: Lin Wang <[email protected]> * Fix duplicate due to security Signed-off-by: Lin Wang <[email protected]> --------- Signed-off-by: Lin Wang <[email protected]>
opensearch-project · Nov 5, 2024 · f87ea71 · f87ea71
1 parent 75c9c12
commit f87ea71
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/.github/workflows/cypress-workflow-bundle-snapshot-based-ci-groups.yml b/.github/workflows/cypress-workflow-bundle-snapshot-based-ci-groups.yml
@@ -8,6 +8,7 @@ on:
       - 'cypress/utils/dashboards/**'
       - 'package.json'
       - '.github/actions/start-opensearch/action.yml'
+      - '.github/workflows/release-e2e-workflow-template.yml'
 
   push:
     branches: ['**']
@@ -17,6 +18,7 @@ on:
       - 'cypress/utils/dashboards/**'
       - 'package.json'
       - '.github/actions/start-opensearch/action.yml'
+      - '.github/workflows/release-e2e-workflow-template.yml'
 
 env:
   CI_GROUPS: "1,2,3,4,5,6,7,8,9"
@@ -71,6 +73,7 @@ jobs:
       test-name: "osd:ciGroup${{ matrix.ciGroup }}"
       test-command: env CYPRESS_NO_COMMAND_LOG=1 CYPRESS_ML_COMMONS_DASHBOARDS_ENABLED=true CYPRESS_VISBUILDER_ENABLED=true CYPRESS_DATASOURCE_MANAGEMENT_ENABLED=true yarn cypress:run-with-security --browser chromium --spec '${{ matrix.specs }}'
       osd-serve-args: --data_source.enabled=true --data_source.ssl.verificationMode=none --vis_builder.enabled=true --ml_commons_dashboards.enabled=true
+      artifact-name-suffix: "-with-security-ciGroup${{ matrix.ciGroup }}"
 
   tests-without-security:
     needs: ["get_spec"]
@@ -85,6 +88,8 @@ jobs:
       test-command: env CYPRESS_NO_COMMAND_LOG=1 CYPRESS_ML_COMMONS_DASHBOARDS_ENABLED=true CYPRESS_VISBUILDER_ENABLED=true CYPRESS_DATASOURCE_MANAGEMENT_ENABLED=true yarn cypress:run-without-security --browser chromium --spec '${{ matrix.specs }}'
       osd-serve-args: --data_source.enabled=true --data_source.ssl.verificationMode=none --vis_builder.enabled=true --ml_commons_dashboards.enabled=true
       security-enabled: false
+      artifact-name-suffix: "-without-security-ciGroup${{ matrix.ciGroup }}"
+
 
   # Hold on windows test cases
   # https://github.com/opensearch-project/opensearch-dashboards-functional-test/actions/runs/9377445544/job/25819022121?pr=1352

diff --git a/.github/workflows/release-e2e-workflow-template.yml b/.github/workflows/release-e2e-workflow-template.yml
@@ -14,6 +14,9 @@ on:
       security-enabled:
         required: false
         type: string
+      artifact-name-suffix:
+        required: false
+        type: string
 jobs:
   tests:
     name: Run Cypress E2E tests for ${{ inputs.test-name }}
@@ -135,17 +138,17 @@ jobs:
       - uses: actions/upload-artifact@v4
         if: failure()
         with:
-          name: cypress-screenshots
+          name: cypress-screenshots${{ inputs.artifact-name-suffix }}
           path: cypress-test/cypress/screenshots
       # Test run video was always captured, so this action uses "always()" condition
       - uses: actions/upload-artifact@v4
         if: always()
         with:
-          name: cypress-videos
+          name: cypress-videos${{ inputs.artifact-name-suffix }}
           path: cypress-test/cypress/videos
       # Test reports was always captured, so this action uses "always()" condition
       - uses: actions/upload-artifact@v4
         if: always()
         with:
-          name: cypress-results
+          name: cypress-results${{ inputs.artifact-name-suffix }}
           path: cypress-test/cypress/results