ansible: update openjdk, remove smartos21 references

nodejs · Dec 22, 2024 · 9b64b06 · 9b64b06
1 parent 7dc0f92
commit 9b64b06
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 15 deletions.
diff --git 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 [email protected]"'

diff --git 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
@@ -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
@@ -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'
   }