From 67a75aa09e75104916759336726f941e1a1a10b4 Mon Sep 17 00:00:00 2001 From: Helvio Junior Date: Tue, 3 Jun 2025 19:31:20 -0300 Subject: [PATCH] Utilization of Yum or Apt according Unix version --- .../plugins/ec2/ssh/EC2UnixLauncher.java | 51 ++++++++++++++----- 1 file changed, 37 insertions(+), 14 deletions(-) diff --git a/src/main/java/hudson/plugins/ec2/ssh/EC2UnixLauncher.java b/src/main/java/hudson/plugins/ec2/ssh/EC2UnixLauncher.java index c68b93d9d..194cddecd 100644 --- a/src/main/java/hudson/plugins/ec2/ssh/EC2UnixLauncher.java +++ b/src/main/java/hudson/plugins/ec2/ssh/EC2UnixLauncher.java @@ -277,20 +277,43 @@ protected void launchScript(EC2Computer computer, TaskListener listener) } } - executeRemote( - computer, - clientSession, - javaPath + " -fullversion", - "sudo amazon-linux-extras install java-openjdk11 -y; sudo yum install -y fontconfig java-11-openjdk", - logger, - listener); - executeRemote( - computer, - clientSession, - "which scp", - "sudo yum install -y openssh-clients", - logger, - listener); + if (executeRemote(clientSession, "which yum", logger)) { + logInfo(computer, listener, "Using yum as package manager..."); + + executeRemote( + computer, + clientSession, + javaPath + " -fullversion", + "sudo amazon-linux-extras install java-openjdk11 -y; sudo yum install -y fontconfig java-11-openjdk", + logger, + listener); + executeRemote( + computer, + clientSession, + "which scp", + "sudo yum install -y openssh-clients", + logger, + listener); + + } + + if (executeRemote(clientSession, "which apt", logger)) { + logInfo(computer, listener, "Using apt as package manager..."); + executeRemote( + computer, + clientSession, + javaPath + " -fullversion", + "apt install -y --no-install-recommends fontconfig openjdk-11-jdk-headless", + logger, + listener); + executeRemote( + computer, + clientSession, + "which scp", + "sudo apt install -y openssh-client", + logger, + listener); + } // Always copy so we get the most recent remoting.jar logInfo(computer, listener, "Copying remoting.jar to: " + tmpDir);