From b5389634494b5e50df76c1ea3598d4e41bd3bf8e Mon Sep 17 00:00:00 2001 From: Lin Wang Date: Thu, 12 Sep 2024 15:22:40 +0800 Subject: [PATCH 1/4] Fix duplicate test cypress result name Signed-off-by: Lin Wang --- .github/workflows/release-e2e-workflow-template.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release-e2e-workflow-template.yml b/.github/workflows/release-e2e-workflow-template.yml index 39ba7d795..8b7104b46 100644 --- a/.github/workflows/release-e2e-workflow-template.yml +++ b/.github/workflows/release-e2e-workflow-template.yml @@ -135,17 +135,17 @@ jobs: - uses: actions/upload-artifact@v4 if: failure() with: - name: cypress-screenshots + name: cypress-screenshots${{ inputs.test-name }} 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.test-name }} 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.test-name }} path: cypress-test/cypress/results From 787a30e65a082e6827b73a26ab704e3f1ee2319e Mon Sep 17 00:00:00 2001 From: Lin Wang Date: Mon, 4 Nov 2024 15:32:05 +0800 Subject: [PATCH 2/4] Rerun ci groups after base template updated Signed-off-by: Lin Wang --- .../cypress-workflow-bundle-snapshot-based-ci-groups.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/cypress-workflow-bundle-snapshot-based-ci-groups.yml b/.github/workflows/cypress-workflow-bundle-snapshot-based-ci-groups.yml index 7a1067bd2..6263bc265 100644 --- 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" From 08b4bd32e405c1a5fed648b65cb0723a20838b03 Mon Sep 17 00:00:00 2001 From: Lin Wang Date: Mon, 4 Nov 2024 16:01:12 +0800 Subject: [PATCH 3/4] Fix invalid characters in test name Signed-off-by: Lin Wang --- .../cypress-workflow-bundle-snapshot-based-ci-groups.yml | 3 +++ .github/workflows/release-e2e-workflow-template.yml | 9 ++++++--- 2 files changed, 9 insertions(+), 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 index 6263bc265..fdd15da82 100644 --- a/.github/workflows/cypress-workflow-bundle-snapshot-based-ci-groups.yml +++ b/.github/workflows/cypress-workflow-bundle-snapshot-based-ci-groups.yml @@ -73,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: "-ciGroup${{ matrix.ciGroup }}" tests-without-security: needs: ["get_spec"] @@ -87,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: "-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 index 8b7104b46..947c52f97 100644 --- 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${{ inputs.test-name }} + 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${{ inputs.test-name }} + 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${{ inputs.test-name }} + name: cypress-results${{ inputs.artifact-name-suffix }} path: cypress-test/cypress/results From 9ddbde0a16392a008d23ab09bf260f31f4bc7124 Mon Sep 17 00:00:00 2001 From: Lin Wang Date: Mon, 4 Nov 2024 16:15:07 +0800 Subject: [PATCH 4/4] Fix duplicate due to security Signed-off-by: Lin Wang --- .../cypress-workflow-bundle-snapshot-based-ci-groups.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 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 index fdd15da82..111450a0e 100644 --- a/.github/workflows/cypress-workflow-bundle-snapshot-based-ci-groups.yml +++ b/.github/workflows/cypress-workflow-bundle-snapshot-based-ci-groups.yml @@ -73,7 +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: "-ciGroup${{ matrix.ciGroup }}" + artifact-name-suffix: "-with-security-ciGroup${{ matrix.ciGroup }}" tests-without-security: needs: ["get_spec"] @@ -88,7 +88,7 @@ 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: "-ciGroup${{ matrix.ciGroup }}" + artifact-name-suffix: "-without-security-ciGroup${{ matrix.ciGroup }}" # Hold on windows test cases