From 795c9b21ace8af4b4701a07e47c10502878215ad Mon Sep 17 00:00:00 2001
From: Miki <miki@amazon.com>
Date: Tue, 16 May 2023 19:32:19 -0700
Subject: [PATCH] Revert "[CI] setup Chrome and utilize binary path (#3997)"

This reverts commit 0188d052

Signed-off-by: Miki <miki@amazon.com>
---
 .github/workflows/build_and_test_workflow.yml | 11 ----------
 scripts/upgrade_chromedriver.js               | 21 ++-----------------
 2 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/build_and_test_workflow.yml b/.github/workflows/build_and_test_workflow.yml
index 8e7ea94245cd..92aca011e9f8 100644
--- a/.github/workflows/build_and_test_workflow.yml
+++ b/.github/workflows/build_and_test_workflow.yml
@@ -344,17 +344,6 @@ jobs:
           npm i -g yarn@1.22.10
           yarn config set network-timeout 1000000 -g
 
-      - name: Configure Yarn Cache
-        run: echo "YARN_CACHE_LOCATION=$(yarn cache dir)" >> $GITHUB_ENV
-
-      - name: Initialize Yarn Cache
-        uses: actions/cache@v3
-        with:
-          path: ${{ env.YARN_CACHE_LOCATION }}
-          key: yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            yarn-
-
       - name: Get package version
         run: |
           echo "VERSION=$(yarn --silent pkg-version)" >> $GITHUB_ENV
diff --git a/scripts/upgrade_chromedriver.js b/scripts/upgrade_chromedriver.js
index ee992706a1fc..224486bb9867 100644
--- a/scripts/upgrade_chromedriver.js
+++ b/scripts/upgrade_chromedriver.js
@@ -25,34 +25,17 @@ const versionCheckCommands = [];
 switch (process.platform) {
   case 'win32':
     versionCheckCommands.push(
-      ...[
-        ...(process.env.TEST_BROWSER_BINARY_PATH
-          ? [
-              `powershell "(Get-Item \\"${process.env.TEST_BROWSER_BINARY_PATH}\\").VersionInfo.FileVersion"`,
-            ]
-          : []),
-        'powershell "(Get-Item \\"$Env:Programfiles/Google/Chrome/Application/chrome.exe\\").VersionInfo.FileVersion"',
-      ]
+      'powershell "(Get-Item \\"$Env:Programfiles/Google/Chrome/Application/chrome.exe\\").VersionInfo.FileVersion"'
     );
     break;
 
   case 'darwin':
     versionCheckCommands.push(
-      ...[
-        ...(process.env.TEST_BROWSER_BINARY_PATH
-          ? [`${process.env.TEST_BROWSER_BINARY_PATH} --version`]
-          : []),
-        '/Applications/Google\\ Chrome.app/Contents/MacOS/Google\\ Chrome --version',
-      ]
+      '/Applications/Google\\ Chrome.app/Contents/MacOS/Google\\ Chrome --version'
     );
     break;
 
   default:
-    versionCheckCommands.push(
-      ...(process.env.TEST_BROWSER_BINARY_PATH
-        ? [`${process.env.TEST_BROWSER_BINARY_PATH} --version`]
-        : [])
-    );
     versionCheckCommands.push(
       ...[
         '/usr/bin',