Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support JDK-20 builds on Jenkins #280

Merged
merged 2 commits into from
May 19, 2023
+7 −3
Merged

Support JDK-20 builds on Jenkins #280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2dc9186
Support JDK-20 builds on Jenkins
reta May 5, 2023
6d4e2d0
Merge remote-tracking branch 'upstream/main' into issue-3425
peterzhuamazon May 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions lib/compute/agent-node-config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,10 @@ export class AgentNodeConfig {
key: 'JAVA19_HOME',
value: '/usr/lib/jvm/temurin-19-jdk-amd64',
},
{
key: 'JAVA20_HOME',
value: '/usr/lib/jvm/temurin-20-jdk-amd64',
},
],
},
},
Expand Down
4 changes: 2 additions & 2 deletions packer/scripts/ubuntu2004/ubuntu2004-agent-setups.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ sudo apt-get install -y apt-transport-https gnupg
curl -SL https://packages.adoptium.net/artifactory/api/gpg/key/public | sudo apt-key add -
echo "deb https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" | sudo tee /etc/apt/sources.list.d/adoptium.list
sudo apt-get update -y
sudo apt-get install -y temurin-8-jdk temurin-11-jdk temurin-17-jdk temurin-19-jdk
sudo apt-get install -y temurin-8-jdk temurin-11-jdk temurin-17-jdk temurin-19-jdk temurin-20-jdk
# JDK14 required for gradle check to do bwc tests
curl -SL "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12/OpenJDK14U-jdk_x64_linux_hotspot_14.0.2_12.tar.gz" -o jdk14.tar.gz
tar -xzf jdk14.tar.gz && rm jdk14.tar.gz
Expand All @@ -47,5 +47,5 @@ sudo update-alternatives --set "java" "/usr/lib/jvm/temurin-11-jdk-amd64/bin/jav
sudo update-alternatives --set "javac" "/usr/lib/jvm/temurin-11-jdk-amd64/bin/javac"
java -version

sudo apt-mark hold docker docker.io openssh-server temurin-8-jdk temurin-11-jdk temurin-17-jdk temurin-19-jdk
sudo apt-mark hold docker docker.io openssh-server temurin-8-jdk temurin-11-jdk temurin-17-jdk temurin-19-jdk temurin-20-jdk
sudo apt-get clean -y
2 changes: 1 addition & 1 deletion packer/scripts/windows/scoop-install-commons.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ $zlibRegFilePath
regedit /s $zlibRegFilePath

# Install jdk
$jdkVersionList = "temurin8-jdk JAVA8_HOME", "temurin11-jdk JAVA11_HOME", "temurin17-jdk JAVA17_HOME", "temurin19-jdk JAVA19_HOME", "openjdk14 JAVA14_HOME"
$jdkVersionList = "temurin8-jdk JAVA8_HOME", "temurin11-jdk JAVA11_HOME", "temurin17-jdk JAVA17_HOME", "temurin19-jdk JAVA19_HOME", "temurin20-jdk JAVA20_HOME", "openjdk14 JAVA14_HOME"
Foreach ($jdkVersion in $jdkVersionList)
{
$jdkVersion
Expand Down