Modify workflow to add debugLwcTests test in redhat (#5924)

* feat: debugLwcTests test in redhat * chore: remove lwcredhat.yml
forcedotcom · Oct 28, 2024 · 492ed3c · 492ed3c
1 parent 28ad5d0
commit 492ed3c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 158 deletions.
diff --git 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
@@ -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
@@ -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,21 +62,21 @@ 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 }}
     uses: ./.github/workflows/runE2ETest.yml
     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