From e5eb0d2042ae692f110a0a2062211f153893236f Mon Sep 17 00:00:00 2001 From: sinedd777 Date: Sun, 27 Jul 2025 15:17:31 -0500 Subject: [PATCH] Fix JENKINS-75199: Support Amazon Linux 2023 by detecting package manager The EC2 plugin was failing to provision AL2023 instances because amazon-linux-extras command doesn't exist on AL2023. This change: - Detects if amazon-linux-extras is available before using it - Falls back to dnf for AL2023 which uses java-11-amazon-corretto-devel - Maintains backward compatibility with AL2 and older AMIs - Installs the same dependencies (Java 11 and fontconfig) on both paths This allows the plugin to work with both Amazon Linux 2 and Amazon Linux 2023 without breaking existing functionality. --- src/main/java/hudson/plugins/ec2/ssh/EC2UnixLauncher.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/hudson/plugins/ec2/ssh/EC2UnixLauncher.java b/src/main/java/hudson/plugins/ec2/ssh/EC2UnixLauncher.java index de8bb56c4..5385d1c6c 100644 --- a/src/main/java/hudson/plugins/ec2/ssh/EC2UnixLauncher.java +++ b/src/main/java/hudson/plugins/ec2/ssh/EC2UnixLauncher.java @@ -209,7 +209,10 @@ protected void launchScript(EC2Computer computer, TaskListener listener) computer, clientSession, javaPath + " -fullversion", - "sudo amazon-linux-extras install java-openjdk11 -y; sudo yum install -y fontconfig java-11-openjdk", + "(command -v amazon-linux-extras >/dev/null 2>&1 && " + + "sudo amazon-linux-extras install java-openjdk11 -y && " + + "sudo yum install -y fontconfig java-11-openjdk) || " + + "sudo dnf install -y java-11-amazon-corretto-devel fontconfig", logger, listener); executeRemote(