From 9b64b06b3977383465d1f1b5f01ef4ed6b8fa4d8 Mon Sep 17 00:00:00 2001
From: Ryan Aslett <github@ryanaslett.com>
Date: Sat, 14 Dec 2024 15:36:33 -0800
Subject: [PATCH] ansible: update openjdk, remove smartos21 references

---
 ansible/inventory.yml                      | 4 ----
 ansible/roles/baselayout/vars/main.yml     | 7 -------
 ansible/roles/java-base/vars/main.yml      | 2 +-
 ansible/roles/jenkins-worker/vars/main.yml | 5 ++---
 4 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/ansible/inventory.yml b/ansible/inventory.yml
index de819558b..fc86e8a73 100644
--- a/ansible/inventory.yml
+++ b/ansible/inventory.yml
@@ -237,10 +237,6 @@ hosts:
         # to update the Jenkins worker IP allowlist in github-bot
         ubuntu2204-x64-1: {ip: 67.158.54.159, alias: jenkins-workspace-9}
         ubuntu2204-x64-2: {ip: 8.225.232.44, alias: jenkins-workspace-10}
-        smartos21-x64-1: {ip: 8.225.232.135}
-        smartos21-x64-2: {ip: 8.225.232.137}
-        smartos23-x64-1: {ip: 8.225.232.134}
-        smartos23-x64-2: {ip: 8.225.232.141}
         smartos22-x64-1:
           ip: 172.16.9.3
           ansible_ssh_common_args: '-o ProxyCommand="ssh -i ~/.ssh/nodejs_build_test -W %h:%p root@67.158.54.157"'
diff --git a/ansible/roles/baselayout/vars/main.yml b/ansible/roles/baselayout/vars/main.yml
index fdd6e4a11..bf6686fd5 100644
--- a/ansible/roles/baselayout/vars/main.yml
+++ b/ansible/roles/baselayout/vars/main.yml
@@ -10,7 +10,6 @@ git_version: 2.10.2
 ssh_config: /etc/ssh/sshd_config
 
 sshd_service_map: {
-  'smartos21': 'ssh',
   'smartos22': 'ssh',
   'smartos23': 'ssh',
 }
@@ -105,12 +104,6 @@ packages: {
     'sudo',
   ],
 
-  smartos21: [
-    'gcc10',
-    'ccache',
-    'py310-pip'
-  ],
-
   smartos22: [
     'gcc12',
     'ccache',
diff --git a/ansible/roles/java-base/vars/main.yml b/ansible/roles/java-base/vars/main.yml
index f4ef4e5b2..dea405dcc 100644
--- a/ansible/roles/java-base/vars/main.yml
+++ b/ansible/roles/java-base/vars/main.yml
@@ -15,7 +15,7 @@ packages: {
   'rhel7': 'java-11-openjdk',
   'rhel8': 'java-17-openjdk',
   'rhel9': 'java-17-openjdk',
-  'smartos': 'openjdk11',
+  'smartos': 'openjdk17',
   'ubuntu': 'openjdk-17-jre-headless',
   'ubuntu1604': 'openjdk-8-jre-headless',
   'ubuntu2204': 'openjdk-17-jre-headless',
diff --git a/ansible/roles/jenkins-worker/vars/main.yml b/ansible/roles/jenkins-worker/vars/main.yml
index 3f1e3f08e..95c41ff75 100644
--- a/ansible/roles/jenkins-worker/vars/main.yml
+++ b/ansible/roles/jenkins-worker/vars/main.yml
@@ -65,9 +65,8 @@ java_path: {
   'macos10.15': 'java',
   'macos11': 'java',
   'macos11.0': 'java',
-  'smartos21': '/opt/local/java/openjdk11/bin/java',
-  'smartos22': '/opt/local/java/openjdk11/bin/java',
-  'smartos23': '/opt/local/java/openjdk11/bin/java',
+  'smartos22': '/opt/local/java/openjdk17/bin/java',
+  'smartos23': '/opt/local/java/openjdk17/bin/java',
   'zos24': '/usr/lpp/java/J8.0_64/bin/java'
   }