From 14b93d883d4b91ce56e8fab59f3949301fe4280c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cristina=20Ca=C3=B1izales?=
 <113132642+CristiCanizales@users.noreply.github.com>
Date: Thu, 24 Oct 2024 14:14:52 -0300
Subject: [PATCH] Modify workflow to add orgBrowser test in redhat (#5917)

* chore: orgBrowser test in redhat

* chore: screenshots
---
 .github/workflows/deployRetrieveE2EredHat.yml | 63 ++++++++++---------
 .github/workflows/runE2ETest.yml              |  7 ++-
 2 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/.github/workflows/deployRetrieveE2EredHat.yml b/.github/workflows/deployRetrieveE2EredHat.yml
index cde9efa611..5e0293b9c0 100644
--- a/.github/workflows/deployRetrieveE2EredHat.yml
+++ b/.github/workflows/deployRetrieveE2EredHat.yml
@@ -23,11 +23,11 @@ on:
         required: false
         default: true
         type: boolean
-      # orgBrowser:
-      #   description: 'Org Browser'
-      #   required: false
-      #   default: true
-      #   type: boolean
+      orgBrowser:
+        description: 'Org Browser'
+        required: false
+        default: true
+        type: boolean
       # pushAndPull:
       #   description: 'Push and Pull'
       #   required: false
@@ -70,11 +70,11 @@ on:
         required: false
         default: true
         type: boolean
-      # orgBrowser:
-      #   description: 'Org Browser'
-      #   required: false
-      #   default: true
-      #   type: boolean
+      orgBrowser:
+        description: 'Org Browser'
+        required: false
+        default: true
+        type: boolean
       # pushAndPull:
       #   description: 'Push and Pull'
       #   required: false
@@ -127,15 +127,16 @@ jobs:
       vscodeVersion: ${{ inputs.vscodeVersion }}
       runId: ${{ inputs.runId }}
 
-  # orgBrowser:
-  #   if: ${{ inputs.orgBrowser }}
-  #   uses: ./.github/workflows/runE2ETest.yml
-  #   secrets: inherit
-  #   with:
-  #     automationBranch: ${{ inputs.automationBranch }}
-  #     testToRun: 'orgBrowser.e2e.js'
-  #     vscodeVersion: ${{ inputs.vscodeVersion }}
-  #     runId: ${{ inputs.runId }}
+  orgBrowser:
+    if: ${{ inputs.orgBrowser }}
+    uses: ./.github/workflows/runE2ETest.yml
+    secrets: inherit
+    with:
+      automationBranch: ${{ inputs.automationBranch }}
+      automationRepo: 'salesforcedx-vscode-automation-tests-redhat'
+      testToRun: 'orgBrowser.e2e.js'
+      vscodeVersion: ${{ inputs.vscodeVersion }}
+      runId: ${{ inputs.runId }}
 
   # pushAndPull:
   #   if: ${{ inputs.pushAndPull }}
@@ -163,8 +164,8 @@ jobs:
     needs: [
         # deployAndRetrieve,
         # diffAndConflictDetection,
-        manifestBuilder
-        # orgBrowser,
+        manifestBuilder,
+        orgBrowser
         # pushAndPull,
         # mdDeployRetrieve
       ]
@@ -174,8 +175,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- Manifest Builder: ${{ needs.manifestBuilder.result }}\n- Org Browser: ${{ needs.orgBrowser.result }}\n- Push and Pull: ${{ needs.pushAndPull.result }}'
-      summary: '\n- Manifest Builder: ${{ needs.manifestBuilder.result }}'
+      # 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 }}'
       result: 'All the tests passed.'
       workflow: 'actions/runs/${{ github.run_id }}'
       type: 'e2e'
@@ -185,8 +186,8 @@ jobs:
     needs: [
         # deployAndRetrieve,
         # diffAndConflictDetection,
-        manifestBuilder
-        # orgBrowser,
+        manifestBuilder,
+        orgBrowser
         # pushAndPull,
         # mdDeployRetrieve
       ]
@@ -196,8 +197,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- Manifest Builder: ${{ needs.manifestBuilder.result }}\n- Org Browser: ${{ needs.orgBrowser.result }}\n- Push and Pull: ${{ needs.pushAndPull.result }}'
-      summary: '\n- Manifest Builder: ${{ needs.manifestBuilder.result }}'
+      # 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 }}'
       result: 'Not all the tests passed.'
       workflow: 'actions/runs/${{ github.run_id }}'
       type: 'e2e'
@@ -207,8 +208,8 @@ jobs:
     needs: [
         # deployAndRetrieve,
         # diffAndConflictDetection,
-        manifestBuilder
-        # orgBrowser,
+        manifestBuilder,
+        orgBrowser
         # pushAndPull,
         # mdDeployRetrieve
       ]
@@ -218,8 +219,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- Manifest Builder: ${{ needs.manifestBuilder.result }}\n- Org Browser: ${{ needs.orgBrowser.result }}\n- Push and Pull: ${{ needs.pushAndPull.result }}'
-      summary: '\n- Manifest Builder: ${{ needs.manifestBuilder.result }}'
+      # 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 }}'
       result: 'The workflow was cancelled.'
       workflow: 'actions/runs/${{ github.run_id }}'
       type: 'e2e'
diff --git a/.github/workflows/runE2ETest.yml b/.github/workflows/runE2ETest.yml
index 905a3d66db..55cb76ac7d 100644
--- a/.github/workflows/runE2ETest.yml
+++ b/.github/workflows/runE2ETest.yml
@@ -126,7 +126,12 @@ jobs:
           ORG_ID: ${{ secrets.ORG_ID_E2E }}
           THROTTLE_FACTOR: ${{ env.THROTTLE_FACTOR }}
       - uses: actions/upload-artifact@v4
-        if: failure()
+        if: failure() && inputs.automationRepo == 'salesforcedx-vscode-automation-tests'
         with:
           name: screenshots-${{ inputs.testToRun }}-${{ matrix.os }}
           path: ./${{ inputs.automationRepo }}/screenshots
+      - uses: actions/upload-artifact@v4
+        if: failure() && inputs.automationRepo == 'salesforcedx-vscode-automation-tests-redhat'
+        with:
+          name: screenshots-${{ inputs.testToRun }}-${{ matrix.os }}
+          path: ./salesforcedx-vscode/extensions/screenshots