Skip to content

Commit

Permalink
ansible: update smartos hosts to Java 11 (#3095)
Browse files Browse the repository at this point in the history
Update smartos CI hosts to Java 11. Remove obsolete entries for
older versions of smartos.

Refs: #3030
  • Loading branch information
richardlau authored Nov 24, 2022
1 parent 8623555 commit 216ffd5
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 7 deletions.
2 changes: 1 addition & 1 deletion ansible/roles/java-base/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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) }}"

Expand Down
2 changes: 1 addition & 1 deletion ansible/roles/java-base/vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
7 changes: 2 additions & 5 deletions ansible/roles/jenkins-worker/vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}

Expand Down

0 comments on commit 216ffd5

Please sign in to comment.