From 3ec379c33cc118e5a90780aed9952f6d71e6dda4 Mon Sep 17 00:00:00 2001
From: Peter Zhu <zhujiaxi@amazon.com>
Date: Fri, 2 Jun 2023 17:39:27 -0400
Subject: [PATCH] Resolve Windows chromium path and add jdk20 tool on Jenkins

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
---
 packer/scripts/windows/scoop-install-commons.ps1 | 4 +---
 resources/baseJenkins.yaml                       | 6 ++++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/packer/scripts/windows/scoop-install-commons.ps1 b/packer/scripts/windows/scoop-install-commons.ps1
index de8854d2..c96c3536 100644
--- a/packer/scripts/windows/scoop-install-commons.ps1
+++ b/packer/scripts/windows/scoop-install-commons.ps1
@@ -162,10 +162,8 @@ $chromiumName = 'chrome.exe'
 $chromiumDir = 'C:\\Users\\Administrator\\scoop\\apps\\chromium'
 $chromiumFound = (Get-ChildItem -Path $chromiumDir -Filter $chromiumName -Recurse | %{$_.FullName} | select -first 1)
 $chromiumFound
-$chromiumPathFound = $chromiumFound.replace("$chromiumName", '')
-$chromiumPathFound
 # Add BROWSER_PATH path to User Env Var for cypress test to retrieve chromium.exe path
-[System.Environment]::SetEnvironmentVariable("BROWSER_PATH", "$chromiumPathFound", [System.EnvironmentVariableTarget]::User)
+[System.Environment]::SetEnvironmentVariable("BROWSER_PATH", "$chromiumFound", [System.EnvironmentVariableTarget]::User)
 
 # Install ruby24
 scoop install ruby24
diff --git a/resources/baseJenkins.yaml b/resources/baseJenkins.yaml
index 010ad72b..5f544557 100644
--- a/resources/baseJenkins.yaml
+++ b/resources/baseJenkins.yaml
@@ -184,6 +184,12 @@ tool:
           installers:
           - adoptOpenJdkInstaller:
               id: "jdk-19.0.1+10"
+    - name: "openjdk-20"
+      properties:
+      - installSource:
+          installers:
+          - adoptOpenJdkInstaller:
+              id: "jdk-20.0.1+9"
   mavenGlobalConfig:
     globalSettingsProvider: "standard"
     settingsProvider: "standard"