diff --git a/.github/workflows/deployRetrieveE2EredHat.yml b/.github/workflows/deployRetrieveE2EredHat.yml index 5e0293b9c0..788acd6e91 100644 --- a/.github/workflows/deployRetrieveE2EredHat.yml +++ b/.github/workflows/deployRetrieveE2EredHat.yml @@ -8,11 +8,11 @@ on: required: false default: 'main' type: string - # deployAndRetrieve: - # description: 'Deploy and Retrieve' - # required: false - # default: true - # type: boolean + deployAndRetrieve: + description: 'Deploy and Retrieve' + required: false + default: true + type: boolean # diffAndConflictDetection: # description: "Diff and Conflict Detection" # required: false @@ -55,11 +55,11 @@ on: required: false default: 'main' type: string - # deployAndRetrieve: - # description: 'Deploy and Retrieve' - # required: false - # default: true - # type: boolean + deployAndRetrieve: + description: 'Deploy and Retrieve' + required: false + default: true + type: boolean # diffAndConflictDetection: # description: "Diff and Conflict Detection" # required: false @@ -96,15 +96,16 @@ on: type: string jobs: - # deployAndRetrieve: - # if: ${{ inputs.deployAndRetrieve }} - # uses: ./.github/workflows/runE2ETest.yml - # secrets: inherit - # with: - # automationBranch: ${{ inputs.automationBranch }} - # testToRun: 'deployAndRetrieve.e2e.js' - # vscodeVersion: ${{ inputs.vscodeVersion }} - # runId: ${{ inputs.runId }} + deployAndRetrieve: + if: ${{ inputs.deployAndRetrieve }} + uses: ./.github/workflows/runE2ETest.yml + secrets: inherit + with: + automationBranch: ${{ inputs.automationBranch }} + automationRepo: 'salesforcedx-vscode-automation-tests-redhat' + testToRun: 'deployAndRetrieve.e2e.js' + vscodeVersion: ${{ inputs.vscodeVersion }} + runId: ${{ inputs.runId }} # diffAndConflictDetection: # if: ${{ inputs.diffAndConflictDetection }} @@ -162,7 +163,7 @@ jobs: slack_success_notification: if: ${{ success() }} needs: [ - # deployAndRetrieve, + deployAndRetrieve, # diffAndConflictDetection, manifestBuilder, orgBrowser @@ -175,8 +176,8 @@ jobs: title: 'Deploy and Retrieve E2E Tests' vscodeVersion: ${{ inputs.vscodeVersion }} testsBranch: ${{ inputs.automationBranch }} - # summary: '\n- Deploy and Retrieve: ${{ needs.deployAndRetrieve.result }}\n- Diff and Conflict Detection: ${{ needs.diffAndConflictDetection.result }}\n- Push and Pull: ${{ needs.pushAndPull.result }}' - summary: '\n- Manifest Builder: ${{ needs.manifestBuilder.result }}\n- Org Browser: ${{ needs.orgBrowser.result }}' + # summary: '\n- Diff and Conflict Detection: ${{ needs.diffAndConflictDetection.result }}\n- Push and Pull: ${{ needs.pushAndPull.result }}' + summary: '\n- Deploy and Retrieve: ${{ needs.deployAndRetrieve.result }}\n- Manifest Builder: ${{ needs.manifestBuilder.result }}\n- Org Browser: ${{ needs.orgBrowser.result }}' result: 'All the tests passed.' workflow: 'actions/runs/${{ github.run_id }}' type: 'e2e' @@ -184,7 +185,7 @@ jobs: slack_failure_notification: if: ${{ failure()}} needs: [ - # deployAndRetrieve, + deployAndRetrieve, # diffAndConflictDetection, manifestBuilder, orgBrowser @@ -197,8 +198,8 @@ jobs: title: 'Deploy and Retrieve E2E Tests' vscodeVersion: ${{ inputs.vscodeVersion }} testsBranch: ${{ inputs.automationBranch }} - # summary: '\n- Deploy and Retrieve: ${{ needs.deployAndRetrieve.result }}\n- Diff and Conflict Detection: ${{ needs.diffAndConflictDetection.result }}\n- Push and Pull: ${{ needs.pushAndPull.result }}' - summary: '\n- Manifest Builder: ${{ needs.manifestBuilder.result }}\n- Org Browser: ${{ needs.orgBrowser.result }}' + # summary: '\n- Diff and Conflict Detection: ${{ needs.diffAndConflictDetection.result }}\n- Push and Pull: ${{ needs.pushAndPull.result }}' + summary: '\n- Deploy and Retrieve: ${{ needs.deployAndRetrieve.result }}\n- Manifest Builder: ${{ needs.manifestBuilder.result }}\n- Org Browser: ${{ needs.orgBrowser.result }}' result: 'Not all the tests passed.' workflow: 'actions/runs/${{ github.run_id }}' type: 'e2e' @@ -206,7 +207,7 @@ jobs: slack_cancelled_notification: if: ${{ cancelled() }} needs: [ - # deployAndRetrieve, + deployAndRetrieve, # diffAndConflictDetection, manifestBuilder, orgBrowser @@ -219,8 +220,8 @@ jobs: title: 'Deploy and Retrieve E2E Tests' vscodeVersion: ${{ inputs.vscodeVersion }} testsBranch: ${{ inputs.automationBranch }} - # summary: '\n- Deploy and Retrieve: ${{ needs.deployAndRetrieve.result }}\n- Diff and Conflict Detection: ${{ needs.diffAndConflictDetection.result }}\n- Push and Pull: ${{ needs.pushAndPull.result }}' - summary: '\n- Manifest Builder: ${{ needs.manifestBuilder.result }}\n- Org Browser: ${{ needs.orgBrowser.result }}' + # summary: '\n- Diff and Conflict Detection: ${{ needs.diffAndConflictDetection.result }}\n- Push and Pull: ${{ needs.pushAndPull.result }}' + summary: '\n- Deploy and Retrieve: ${{ needs.deployAndRetrieve.result }}\n- Manifest Builder: ${{ needs.manifestBuilder.result }}\n- Org Browser: ${{ needs.orgBrowser.result }}' result: 'The workflow was cancelled.' workflow: 'actions/runs/${{ github.run_id }}' type: 'e2e'