ansible: add smartos test hosts and allow for smartos22

ansible/inventory.yml

@@ -242,6 +242,23 @@ hosts:
         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]"'
+          ansible_user: root
+        smartos22-x64-2:
+          ip: 172.16.9.3
+          ansible_ssh_common_args: '-o ProxyCommand="ssh -i ~/.ssh/nodejs_build_test -W %h:%p [email protected]"'
+          ansible_user: root
+        smartos23-x64-4:
+          ip: 172.16.9.3
+          ansible_ssh_common_args: '-o ProxyCommand="ssh -i ~/.ssh/nodejs_build_test -W %h:%p [email protected]"'
+          ansible_user: root
+        smartos23-x64-5:
+          ip: 172.16.9.3
+          ansible_ssh_common_args: '-o ProxyCommand="ssh -i ~/.ssh/nodejs_build_test -W %h:%p [email protected]"'
+          ansible_user: root
+
 
     - osuosl:
         # secret for -1 was compromised, do not use -1 name

ansible/roles/baselayout/vars/main.yml

@@ -11,6 +11,7 @@ ssh_config: /etc/ssh/sshd_config
 
 sshd_service_map: {
   'smartos21': 'ssh',
+  'smartos22': 'ssh',
   'smartos23': 'ssh',
 }
 
@@ -126,11 +127,18 @@ packages: {
     'py310-pip'
   ],
 
+  smartos22: [
+    'gcc12',
+    'ccache',
+    'python311',
+    'py311-pip'
+  ],
+
   smartos23: [
     'gcc13',
     'ccache',
-    'python310',
-    'py310-pip'
+    'python312',
+    'py312-pip'
   ],
 
   ubuntu: [
@@ -145,7 +153,7 @@ packages: {
   # Default gcc/g++ package is 7.
   ubuntu1804: [
     'gcc-6,g++-6,gcc-8,g++-8,python3.8',
-  ],  
+  ],
 
   # Default gcc/g++ package is 11.
   ubuntu2204: [

ansible/roles/jenkins-worker/vars/main.yml

@@ -66,6 +66,7 @@ java_path: {
   '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',
   'zos24': '/usr/lpp/java/J8.0_64/bin/java'
   }