Resolve Windows chromium path and add jdk20 tool on Jenkins (#301)

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
opensearch-project · Jun 12, 2023 · 4913969 · 4913969
1 parent d63044a
commit 4913969
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git 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
@@ -188,6 +188,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"