From 5a8f9a7df9fd3924d04ca47df14ad6600b9362f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cristina=20Ca=C3=B1izales?=
 <113132642+CristiCanizales@users.noreply.github.com>
Date: Wed, 23 Oct 2024 16:49:15 -0300
Subject: [PATCH] Modify workflow to add templates test in redhat (#5916)

* chore: templates test in redhat

* chore: templates test in redhat
---
 .github/workflows/coreE2E.yml   | 25 ++++++++++++++++---------
 .github/workflows/e2e.yml       | 23 -----------------------
 .github/workflows/e2eRedHat.yml |  4 ++--
 3 files changed, 18 insertions(+), 34 deletions(-)

diff --git a/.github/workflows/coreE2E.yml b/.github/workflows/coreE2E.yml
index 3987ba8419..6fe5114592 100644
--- a/.github/workflows/coreE2E.yml
+++ b/.github/workflows/coreE2E.yml
@@ -41,7 +41,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'
@@ -88,7 +88,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'
@@ -102,7 +102,8 @@ jobs:
     secrets: inherit
     with:
       automationBranch: ${{ inputs.automationBranch }}
-      testToRun: 'anInitialSuite.e2e.ts'
+      automationRepo: 'salesforcedx-vscode-automation-tests-redhat'
+      testToRun: 'anInitialSuite.e2e.js'
       vscodeVersion: ${{ inputs.vscodeVersion }}
       runId: ${{ inputs.runId }}
 
@@ -112,7 +113,8 @@ jobs:
     secrets: inherit
     with:
       automationBranch: ${{ inputs.automationBranch }}
-      testToRun: 'authentication.e2e.ts'
+      automationRepo: 'salesforcedx-vscode-automation-tests-redhat'
+      testToRun: 'authentication.e2e.js'
       vscodeVersion: ${{ inputs.vscodeVersion }}
       runId: ${{ inputs.runId }}
 
@@ -122,7 +124,8 @@ jobs:
     secrets: inherit
     with:
       automationBranch: ${{ inputs.automationBranch }}
-      testToRun: 'miscellaneous.e2e.ts'
+      automationRepo: 'salesforcedx-vscode-automation-tests-redhat'
+      testToRun: 'miscellaneous.e2e.js'
       vscodeVersion: ${{ inputs.vscodeVersion }}
       runId: ${{ inputs.runId }}
 
@@ -132,7 +135,8 @@ jobs:
     secrets: inherit
     with:
       automationBranch: ${{ inputs.automationBranch }}
-      testToRun: 'sObjectsDefinitions.e2e.ts'
+      automationRepo: 'salesforcedx-vscode-automation-tests-redhat'
+      testToRun: 'sObjectsDefinitions.e2e.js'
       vscodeVersion: ${{ inputs.vscodeVersion }}
       runId: ${{ inputs.runId }}
 
@@ -142,7 +146,8 @@ jobs:
     secrets: inherit
     with:
       automationBranch: ${{ inputs.automationBranch }}
-      testToRun: 'templates.e2e.ts'
+      automationRepo: 'salesforcedx-vscode-automation-tests-redhat'
+      testToRun: 'templates.e2e.js'
       vscodeVersion: ${{ inputs.vscodeVersion }}
       runId: ${{ inputs.runId }}
 
@@ -152,7 +157,8 @@ jobs:
     secrets: inherit
     with:
       automationBranch: ${{ inputs.automationBranch }}
-      testToRun: 'sfdxProjectJson.e2e.ts'
+      automationRepo: 'salesforcedx-vscode-automation-tests-redhat'
+      testToRun: 'sfdxProjectJson.e2e.js'
       vscodeVersion: ${{ inputs.vscodeVersion }}
       runId: ${{ inputs.runId }}
 
@@ -162,7 +168,8 @@ jobs:
     secrets: inherit
     with:
       automationBranch: ${{ inputs.automationBranch }}
-      testToRun: 'createProjectTest.e2e.ts'
+      automationRepo: 'salesforcedx-vscode-automation-tests-redhat'
+      testToRun: 'createProjectTest.e2e.js'
       vscodeVersion: ${{ inputs.vscodeVersion }}
       runId: ${{ inputs.runId }}
 
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 3df4860d3b..62bf3e946a 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -20,11 +20,6 @@ on:
         required: false
         default: true
         type: boolean
-      coreE2ETests:
-        description: 'Core E2E Tests'
-        required: false
-        default: true
-        type: boolean
       deployAndRetrieveE2ETests:
         description: 'Deploy and Retrieve E2E Tests'
         required: false
@@ -55,15 +50,6 @@ jobs:
       vscodeVersion: ${{ inputs.vscodeVersion || '1.92.2' }}
       runId: ${{ inputs.runId || github.event.workflow_run.id }}
 
-  Core_E2E_tests:
-    if: ${{ inputs.coreE2ETests || (github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success') }}
-    uses: ./.github/workflows/coreE2E.yml
-    secrets: inherit
-    with:
-      automationBranch: ${{ inputs.automationBranch || 'main' }}
-      vscodeVersion: ${{ inputs.vscodeVersion || '1.92.2' }}
-      runId: ${{ inputs.runId || github.event.workflow_run.id }}
-
   DeployAndRetrieve_E2E_tests:
     if: ${{ inputs.deployAndRetrieveE2ETests || (github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success') }}
     uses: ./.github/workflows/deployRetrieveE2E.yml
@@ -91,15 +77,6 @@ jobs:
       vscodeVersion: '1.86.0'
       runId: ${{ github.event.workflow_run.id }}
 
-  Core_E2E_tests_min_vscode_version:
-    if: ${{ github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success' }}
-    uses: ./.github/workflows/coreE2E.yml
-    secrets: inherit
-    with:
-      automationBranch: 'main'
-      vscodeVersion: '1.86.0'
-      runId: ${{ github.event.workflow_run.id }}
-
   DeployAndRetrieve_E2E_tests_min_vscode_version:
     if: ${{ github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success' }}
     uses: ./.github/workflows/deployRetrieveE2E.yml
diff --git a/.github/workflows/e2eRedHat.yml b/.github/workflows/e2eRedHat.yml
index 0aaed093bd..6a53346b49 100644
--- a/.github/workflows/e2eRedHat.yml
+++ b/.github/workflows/e2eRedHat.yml
@@ -62,7 +62,7 @@ jobs:
 
   Core:
     if: ${{ inputs.coreE2ETests || (github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success') }}
-    uses: ./.github/workflows/coreE2EredHat.yml
+    uses: ./.github/workflows/coreE2E.yml
     secrets: inherit
     with:
       automationBranch: ${{ inputs.automationBranch || 'main' }}
@@ -107,7 +107,7 @@ jobs:
 
   Core_min_vscode_version:
     if: ${{ github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success' }}
-    uses: ./.github/workflows/coreE2EredHat.yml
+    uses: ./.github/workflows/coreE2E.yml
     secrets: inherit
     with:
       automationBranch: 'main'