From 1e17b2c1a8cb016127bab6eb5d310ff16e4b6b47 Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Tue, 23 Jul 2024 12:50:01 -0400 Subject: [PATCH] Make sure Ubuntu is using JDK21 when connecting to Main node (#481) Signed-off-by: Peter Zhu --- lib/compute/agent-nodes.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/compute/agent-nodes.ts b/lib/compute/agent-nodes.ts index 290879a1..3012c589 100644 --- a/lib/compute/agent-nodes.ts +++ b/lib/compute/agent-nodes.ts @@ -186,7 +186,8 @@ export class AgentNodes { numExecutors: 1, amiId: 'ami-0182cef5fe6837adb', initScript: 'sudo apt-mark hold docker docker.io openssh-server gh grub-efi* shim-signed && docker ps &&' - + ' sudo apt-get update -y && (sudo killall -9 apt-get apt 2>&1 || echo) && sudo env "DEBIAN_FRONTEND=noninteractive" apt-get upgrade -y', + + ' sudo apt-get update -y && (sudo killall -9 apt-get apt 2>&1 || echo) && sudo env "DEBIAN_FRONTEND=noninteractive" apt-get upgrade -y &&' + + ' sudo update-alternatives --set "java" "/usr/lib/jvm/temurin-21-jdk-amd64/bin/java" && java -version', remoteFs: '/var/jenkins', }; this.UBUNTU2004_X64_DOCKER_BUILDER = { @@ -200,7 +201,8 @@ export class AgentNodes { numExecutors: 1, amiId: 'ami-0182cef5fe6837adb', initScript: 'sudo apt-mark hold docker docker.io openssh-server gh grub-efi* shim-signed && docker ps &&' - + ' sudo apt-get update -y && (sudo killall -9 apt-get apt 2>&1 || echo) && sudo env "DEBIAN_FRONTEND=noninteractive" apt-get upgrade -y', + + ' sudo apt-get update -y && (sudo killall -9 apt-get apt 2>&1 || echo) && sudo env "DEBIAN_FRONTEND=noninteractive" apt-get upgrade -y &&' + + ' sudo update-alternatives --set "java" "/usr/lib/jvm/temurin-21-jdk-amd64/bin/java" && java -version', remoteFs: '/var/jenkins', }; this.MACOS13_X64_MULTI_HOST = {