From 492ed3c42d122dde119c968c6326e68c98d3ba78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristina=20Ca=C3=B1izales?= <113132642+CristiCanizales@users.noreply.github.com> Date: Mon, 28 Oct 2024 19:55:54 -0300 Subject: [PATCH] Modify workflow to add debugLwcTests test in redhat (#5924) * feat: debugLwcTests test in redhat * chore: remove lwcredhat.yml --- .github/workflows/e2e.yml | 23 ------ .github/workflows/e2eRedHat.yml | 4 +- .github/workflows/lwcE2E.yml | 12 +-- .github/workflows/lwcE2EredHat.yml | 127 ----------------------------- 4 files changed, 8 insertions(+), 158 deletions(-) delete mode 100644 .github/workflows/lwcE2EredHat.yml diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 62bf3e946a..aaecf43033 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -25,11 +25,6 @@ on: required: false default: true type: boolean - lwcE2ETests: - description: 'LWC E2E Tests' - required: false - default: true - type: boolean vscodeVersion: description: 'VSCode Version' required: false @@ -59,15 +54,6 @@ jobs: vscodeVersion: ${{ inputs.vscodeVersion || '1.92.2' }} runId: ${{ inputs.runId || github.event.workflow_run.id }} - LWC_E2E_tests: - if: ${{ inputs.lwcE2ETests || (github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success') }} - uses: ./.github/workflows/lwcE2E.yml - secrets: inherit - with: - automationBranch: ${{ inputs.automationBranch || 'main' }} - vscodeVersion: ${{ inputs.vscodeVersion || '1.92.2' }} - runId: ${{ inputs.runId || github.event.workflow_run.id }} - Apex_E2E_tests_min_vscode_version: if: ${{ github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success' }} uses: ./.github/workflows/apexE2E.yml @@ -85,12 +71,3 @@ jobs: automationBranch: 'main' vscodeVersion: '1.86.0' runId: ${{ github.event.workflow_run.id }} - - LWC_E2E_tests_min_vscode_version: - if: ${{ github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success' }} - uses: ./.github/workflows/lwcE2E.yml - secrets: inherit - with: - automationBranch: 'main' - vscodeVersion: '1.86.0' - runId: ${{ github.event.workflow_run.id }} diff --git a/.github/workflows/e2eRedHat.yml b/.github/workflows/e2eRedHat.yml index 2fcc7236ad..df76d491c9 100644 --- a/.github/workflows/e2eRedHat.yml +++ b/.github/workflows/e2eRedHat.yml @@ -94,7 +94,7 @@ jobs: LWC: if: ${{ inputs.lwcE2ETests || (github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success') }} - uses: ./.github/workflows/lwcE2EredHat.yml + uses: ./.github/workflows/lwcE2E.yml secrets: inherit with: automationBranch: ${{ inputs.automationBranch || 'main' }} @@ -148,7 +148,7 @@ jobs: LWC_min_vscode_version: if: ${{ github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success' }} - uses: ./.github/workflows/lwcE2EredHat.yml + uses: ./.github/workflows/lwcE2E.yml secrets: inherit with: automationBranch: 'main' diff --git a/.github/workflows/lwcE2E.yml b/.github/workflows/lwcE2E.yml index ccb47e3bff..b44c9f8dd5 100644 --- a/.github/workflows/lwcE2E.yml +++ b/.github/workflows/lwcE2E.yml @@ -21,7 +21,7 @@ on: vscodeVersion: description: 'VSCode Version' required: false - default: '1.92.2' + default: 'stable' type: string runId: description: 'Run ID of the workflow run that created the vsixes' @@ -48,7 +48,7 @@ on: vscodeVersion: description: 'VSCode Version' required: false - default: '1.92.2' + default: 'stable' type: string runId: description: 'Run ID of the workflow run that created the vsixes' @@ -62,10 +62,10 @@ jobs: secrets: inherit with: automationBranch: ${{ inputs.automationBranch }} - testToRun: 'debugLwcTests.e2e.ts' + automationRepo: 'salesforcedx-vscode-automation-tests-redhat' + testToRun: 'debugLwcTests.e2e.js' vscodeVersion: ${{ inputs.vscodeVersion }} runId: ${{ inputs.runId }} - os: '["macos-latest"]' runLwcTests: if: ${{ inputs.runLwcTests }} @@ -73,10 +73,10 @@ jobs: secrets: inherit with: automationBranch: ${{ inputs.automationBranch }} - testToRun: 'runLwcTests.e2e.ts' + automationRepo: 'salesforcedx-vscode-automation-tests-redhat' + testToRun: 'runLwcTests.e2e.js' vscodeVersion: ${{ inputs.vscodeVersion }} runId: ${{ inputs.runId }} - os: '["macos-latest"]' slack_success_notification: if: ${{ success() }} diff --git a/.github/workflows/lwcE2EredHat.yml b/.github/workflows/lwcE2EredHat.yml deleted file mode 100644 index 5cbd0f9f3e..0000000000 --- a/.github/workflows/lwcE2EredHat.yml +++ /dev/null @@ -1,127 +0,0 @@ -name: LWC End to End Tests - Redhat - -on: - workflow_dispatch: - inputs: - automationBranch: - description: 'Set the branch to use for automation tests' - required: false - default: 'main' - type: string - # debugLwcTests: - # description: 'Debug LWC Tests' - # required: false - # default: true - # type: boolean - runLwcTests: - description: 'Run LWC Tests' - required: false - default: true - type: boolean - vscodeVersion: - description: 'VSCode Version' - required: false - default: 'stable' - type: string - runId: - description: 'Run ID of the workflow run that created the vsixes' - required: true - type: string - - workflow_call: - inputs: - automationBranch: - description: 'Set the branch to use for automation tests' - required: false - default: 'develop' - type: string - # debugLwcTests: - # description: 'Debug LWC Tests' - # required: false - # default: true - # type: boolean - runLwcTests: - description: 'Run LWC Tests' - required: false - default: true - type: boolean - vscodeVersion: - description: 'VSCode Version' - required: false - default: 'stable' - type: string - runId: - description: 'Run ID of the workflow run that created the vsixes' - required: true - type: string - -jobs: - # debugLwcTests: - # if: ${{ inputs.debugLwcTests }} - # uses: ./.github/workflows/runE2ETest.yml - # secrets: inherit - # with: - # automationBranch: ${{ inputs.automationBranch }} - # automationRepo: 'salesforcedx-vscode-automation-tests-redhat' - # testToRun: 'debugLwcTests.e2e.ts' - # vscodeVersion: ${{ inputs.vscodeVersion }} - # runId: ${{ inputs.runId }} - - runLwcTests: - if: ${{ inputs.runLwcTests }} - uses: ./.github/workflows/runE2ETest.yml - secrets: inherit - with: - automationBranch: ${{ inputs.automationBranch }} - automationRepo: 'salesforcedx-vscode-automation-tests-redhat' - testToRun: 'runLwcTests.e2e.js' - vscodeVersion: ${{ inputs.vscodeVersion }} - runId: ${{ inputs.runId }} - - slack_success_notification: - if: ${{ success() }} - # needs: [debugLwcTests, runLwcTests] - needs: [runLwcTests] - uses: ./.github/workflows/slackNotification.yml - secrets: inherit - with: - title: 'LWC E2E Tests' - vscodeVersion: ${{ inputs.vscodeVersion }} - testsBranch: ${{ inputs.automationBranch }} - summary: '\n- Run LWC Tests: ${{ needs.runLwcTests.result }}' - # summary: '\n- Debug LWC Tests: ${{ needs.debugLwcTests.result }}\n- Run LWC Tests: ${{ needs.runLwcTests.result }}' - result: 'All the tests passed.' - workflow: 'actions/runs/${{ github.run_id }}' - type: 'e2e' - - slack_failure_notification: - if: ${{ failure() }} - # needs: [debugLwcTests, runLwcTests] - needs: [runLwcTests] - uses: ./.github/workflows/slackNotification.yml - secrets: inherit - with: - title: 'LWC E2E Tests' - vscodeVersion: ${{ inputs.vscodeVersion }} - testsBranch: ${{ inputs.automationBranch }} - summary: '\n- Run LWC Tests: ${{ needs.runLwcTests.result }}' - # summary: '\n- Debug LWC Tests: ${{ needs.debugLwcTests.result }}\n- Run LWC Tests: ${{ needs.runLwcTests.result }}' - result: 'Not all the tests passed.' - workflow: 'actions/runs/${{ github.run_id }}' - type: 'e2e' - - slack_cancelled_notification: - if: ${{ cancelled() }} - # needs: [debugLwcTests, runLwcTests] - needs: [runLwcTests] - uses: ./.github/workflows/slackNotification.yml - secrets: inherit - with: - title: 'LWC E2E Tests' - vscodeVersion: ${{ inputs.vscodeVersion }} - testsBranch: ${{ inputs.automationBranch }} - summary: '\n- Run LWC Tests: ${{ needs.runLwcTests.result }}' - # summary: '\n- Debug LWC Tests: ${{ needs.debugLwcTests.result }}\n- Run LWC Tests: ${{ needs.runLwcTests.result }}' - result: 'The workflow was cancelled.' - workflow: 'actions/runs/${{ github.run_id }}' - type: 'e2e'