From 193f47c22759abdc0079166c81b87427024ec7e9 Mon Sep 17 00:00:00 2001
From: Richard Lau <rlau@redhat.com>
Date: Wed, 23 Nov 2022 15:55:15 +0000
Subject: [PATCH] ansible: update smartos hosts to Java 11

Update smartos CI hosts to Java 11. Remove obsolete entries for
older versions of smartos.
---
 ansible/roles/java-base/tasks/main.yml     | 2 +-
 ansible/roles/java-base/vars/main.yml      | 2 +-
 ansible/roles/jenkins-worker/vars/main.yml | 7 ++-----
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/ansible/roles/java-base/tasks/main.yml b/ansible/roles/java-base/tasks/main.yml
index be9a02a99..a821d9b13 100644
--- a/ansible/roles/java-base/tasks/main.yml
+++ b/ansible/roles/java-base/tasks/main.yml
@@ -47,7 +47,7 @@
     - restart Jenkins
   package:
     name: "{{ java_package_name }}"
-    state: latest
+    state: "{{ 'present' if os|match_key(pm) == 'pkgin' else 'latest' }}"
     # Package manager mapping in ansible/roles/package-upgrade/vars/main.yml.
     use: "{{ os|match_key(pm)|default(omit) }}"
 
diff --git a/ansible/roles/java-base/vars/main.yml b/ansible/roles/java-base/vars/main.yml
index a0cd2d9b5..4a5c264b7 100644
--- a/ansible/roles/java-base/vars/main.yml
+++ b/ansible/roles/java-base/vars/main.yml
@@ -17,7 +17,7 @@ packages: {
   'macos': 'temurin17',
   'rhel7': 'java-11-openjdk',
   'rhel8': 'java-17-openjdk',
-  'smartos': 'openjdk8',
+  'smartos': 'openjdk11',
   'ubuntu': 'openjdk-17-jre-headless',
   'ubuntu1604': 'openjdk-8-jre-headless',
   'ubuntu1404': 'oracle-java8-installer',
diff --git a/ansible/roles/jenkins-worker/vars/main.yml b/ansible/roles/jenkins-worker/vars/main.yml
index 09bba7995..81a10012e 100644
--- a/ansible/roles/jenkins-worker/vars/main.yml
+++ b/ansible/roles/jenkins-worker/vars/main.yml
@@ -87,11 +87,8 @@ java_path: {
   'macos10.15': 'java',
   'macos11': 'java',
   'macos11.0': 'java',
-  'smartos15': '/opt/local/java/openjdk8/bin/java',
-  'smartos16': '/opt/local/java/openjdk8/bin/java',
-  'smartos17': '/opt/local/java/openjdk8/bin/java',
-  'smartos18': '/opt/local/java/openjdk8/bin/java',
-  'smartos20': '/opt/local/java/openjdk8/bin/java',
+  'smartos18': '/opt/local/java/openjdk11/bin/java',
+  'smartos20': '/opt/local/java/openjdk11/bin/java',
   'zos24': '/usr/lpp/java/J8.0_64/bin/java'
   }