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..111450a0e 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" @@ -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 index 39ba7d795..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 + 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 diff --git a/cypress/integration/plugins/dashboards-flow-framework/create_workflow_spec.js b/cypress/integration/plugins/dashboards-flow-framework/create_workflow_spec.js index 6eef9aee8..27711c512 100644 --- a/cypress/integration/plugins/dashboards-flow-framework/create_workflow_spec.js +++ b/cypress/integration/plugins/dashboards-flow-framework/create_workflow_spec.js @@ -119,7 +119,7 @@ describe('Creating Workflows Using Various Methods', () => { .click(); const filePath = `cypress/fixtures/${FF_FIXTURE_BASE_PATH}semantic_search/source_data.json`; cy.get('input[type=file]').selectFile(filePath); - cy.getElementByDataTestId('closeSourceDataButton') + cy.getElementByDataTestId('updateSourceDataButton') .should('be.visible') .click(); cy.mockIngestion(() => { @@ -170,7 +170,7 @@ describe('Creating Workflows Using Various Methods', () => { .trigger('blur', { force: true }); }); }); - cy.getElementByDataTestId('searchQueryCloseButton') + cy.getElementByDataTestId('updateSearchQueryButton') .should('be.visible') .click(); cy.mockSemanticSearchIndexSearch(() => { diff --git a/cypress/integration/plugins/index-management-dashboards-plugin/aliases.js b/cypress/integration/plugins/index-management-dashboards-plugin/aliases.js index 6219893f5..35ad9bb33 100644 --- a/cypress/integration/plugins/index-management-dashboards-plugin/aliases.js +++ b/cypress/integration/plugins/index-management-dashboards-plugin/aliases.js @@ -157,7 +157,7 @@ describe('Aliases', () => { body: { test: 'test' }, }); - // confirm uncommitted_operations is 1 after indexing doc + // confirm uncommitted_operations is not 0 after indexing doc cy.request({ method: 'GET', url: `${Cypress.env('openSearchUrl')}/${sample_alias}/_stats/translog`, @@ -167,7 +167,7 @@ describe('Aliases', () => { ); let num = response_obj['_all']['total']['translog']['uncommitted_operations']; - expect(num).to.equal(1); + expect(num).not.equal(0); }); cy.get('[data-test-subj="moreAction"] button') diff --git a/cypress/integration/plugins/index-management-dashboards-plugin/data_streams.js b/cypress/integration/plugins/index-management-dashboards-plugin/data_streams.js index cf99f2c06..550846bc2 100644 --- a/cypress/integration/plugins/index-management-dashboards-plugin/data_streams.js +++ b/cypress/integration/plugins/index-management-dashboards-plugin/data_streams.js @@ -100,7 +100,7 @@ describe('Data stream', () => { body: { '@timestamp': 123123123 }, }); - // confirm uncommitted_operations is 1 after indexing doc + // confirm uncommitted_operations is not 0 after indexing doc cy.request({ method: 'GET', url: `${Cypress.env('openSearchUrl')}/ds-/_stats/translog`, @@ -110,7 +110,7 @@ describe('Data stream', () => { ); let num = response_obj['_all']['total']['translog']['uncommitted_operations']; - expect(num).to.equal(1); + expect(num).not.equal(0); }); cy.get('[data-test-subj="moreAction"]').click(); diff --git a/cypress/integration/plugins/index-management-dashboards-plugin/indices_spec.js b/cypress/integration/plugins/index-management-dashboards-plugin/indices_spec.js index b0de7ef1c..80b6f17ee 100644 --- a/cypress/integration/plugins/index-management-dashboards-plugin/indices_spec.js +++ b/cypress/integration/plugins/index-management-dashboards-plugin/indices_spec.js @@ -618,7 +618,7 @@ describe('Indices', () => { body: { test: 'test' }, }); - // confirm uncommitted_operations is 1 after indexing doc + // confirm uncommitted_operations is not 0 after indexing doc cy.request({ method: 'GET', url: `${Cypress.env('openSearchUrl')}/${SAMPLE_INDEX}/_stats/translog`, @@ -628,7 +628,7 @@ describe('Indices', () => { ); let num = response_obj['_all']['total']['translog']['uncommitted_operations']; - expect(num).to.equal(1); + expect(num).not.equal(0); }); // Select an index @@ -678,7 +678,7 @@ describe('Indices', () => { body: { test: 'test' }, }); - // confirm uncommitted_operations is 1 after indexing doc + // confirm uncommitted_operations is not 0 after indexing doc cy.request({ method: 'GET', url: `${Cypress.env('openSearchUrl')}/${SAMPLE_INDEX}/_stats/translog`, @@ -688,7 +688,7 @@ describe('Indices', () => { ); let num = response_obj['_all']['total']['translog']['uncommitted_operations']; - expect(num).to.equal(1); + expect(num).not.equal(0); }); cy.get('[data-test-subj="moreAction"]').click();