From 3c2d4c0d2d83d9e79184fa4e4799fca5b92ef510 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Tue, 12 Nov 2024 14:10:04 -0500 Subject: [PATCH] ansible: add jdk-17 for jenkins 2.479 The new Jenkins LTS agent.jar is compiled for JAVA >= 17, add it to the SLES and RHEL nodes. Change-Id: I3fbd76d09f0c13a6dcd2b3e4368b4f17c4a91e5f Signed-off-by: Michael Jeanson --- automation/ansible/roles/common-node/vars/RedHat.yml | 4 ++-- automation/ansible/roles/common-node/vars/SLES-12.yml | 3 +-- automation/ansible/roles/common-node/vars/SLES-15.yml | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/automation/ansible/roles/common-node/vars/RedHat.yml b/automation/ansible/roles/common-node/vars/RedHat.yml index 4867365..3ffb28d 100644 --- a/automation/ansible/roles/common-node/vars/RedHat.yml +++ b/automation/ansible/roles/common-node/vars/RedHat.yml @@ -12,8 +12,8 @@ common_node_packages: - gettext - git - htop - - java-11-openjdk-devel - - java-11-openjdk-headless + - java-17-openjdk-devel + - java-17-openjdk-headless - jq - libtool - lzop diff --git a/automation/ansible/roles/common-node/vars/SLES-12.yml b/automation/ansible/roles/common-node/vars/SLES-12.yml index 7bb8323..157e3c4 100644 --- a/automation/ansible/roles/common-node/vars/SLES-12.yml +++ b/automation/ansible/roles/common-node/vars/SLES-12.yml @@ -14,8 +14,7 @@ common_node_packages: - git-core - java-1_8_0-openjdk-devel - java-1_8_0-openjdk-headless - - java-11-openjdk-devel - - java-11-openjdk-headless + - java-17-openjdk-headless - jq - libopenssl-devel # - libtap-harness-archive-perl diff --git a/automation/ansible/roles/common-node/vars/SLES-15.yml b/automation/ansible/roles/common-node/vars/SLES-15.yml index cc7c1d4..5a0544b 100644 --- a/automation/ansible/roles/common-node/vars/SLES-15.yml +++ b/automation/ansible/roles/common-node/vars/SLES-15.yml @@ -13,8 +13,7 @@ common_node_packages: - git-core - java-1_8_0-openjdk-devel - java-1_8_0-openjdk-headless - - java-11-openjdk-devel - - java-11-openjdk-headless + - java-17-openjdk-headless - jq - libopenssl-devel # - libtap-harness-archive-perl -- 2.34.1