Update openjdk8 to openjdk8-redhat as the former is not supported on scoop (#3942)

peterzhuamazon · web-flow · commit c91d2ff566ba · 2023-08-30T18:04:22.000-04:00
Signed-off-by: Peter Zhu &lt;zhujiaxi@amazon.com&gt;
diff --git a/docker/ci/config/windows-servercore-setup.ps1 b/docker/ci/config/windows-servercore-setup.ps1
@@ -84,7 +84,7 @@ regedit /s $zlibRegFilePath
 # Temurin jdk does not have all the versions supported on scoop, especially version 14, 20, and above
 # As of now we will switch everything to openjdk as it has the most complete lineup on scoop
 # This will also affect the distribution build jenkinsfile as it has dependencies on the names
-$jdkVersionList = "openjdk8 JAVA8_HOME", "openjdk11 JAVA11_HOME", "openjdk14 JAVA14_HOME", "openjdk17 JAVA17_HOME", "openjdk19 JAVA19_HOME", "openjdk20 JAVA20_HOME"
+$jdkVersionList = "openjdk8-redhat JAVA8_HOME", "openjdk11 JAVA11_HOME", "openjdk14 JAVA14_HOME", "openjdk17 JAVA17_HOME", "openjdk19 JAVA19_HOME", "openjdk20 JAVA20_HOME"
 Foreach ($jdkVersion in $jdkVersionList)
 {
     $jdkVersion

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ regedit /s $zlibRegFilePath`
`84`	`84`	`# Temurin jdk does not have all the versions supported on scoop, especially version 14, 20, and above`
`85`	`85`	`# As of now we will switch everything to openjdk as it has the most complete lineup on scoop`
`86`	`86`	`# This will also affect the distribution build jenkinsfile as it has dependencies on the names`
`87`		`-$jdkVersionList = "openjdk8 JAVA8_HOME", "openjdk11 JAVA11_HOME", "openjdk14 JAVA14_HOME", "openjdk17 JAVA17_HOME", "openjdk19 JAVA19_HOME", "openjdk20 JAVA20_HOME"`
	`87`	`+$jdkVersionList = "openjdk8-redhat JAVA8_HOME", "openjdk11 JAVA11_HOME", "openjdk14 JAVA14_HOME", "openjdk17 JAVA17_HOME", "openjdk19 JAVA19_HOME", "openjdk20 JAVA20_HOME"`
`88`	`88`	`Foreach ($jdkVersion in $jdkVersionList)`
`89`	`89`	`{`
`90`	`90`	`$jdkVersion`