Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions ansible/roles/java-base/vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@ packages: {
'rhel8': 'java-17-openjdk',
'rhel9': 'java-17-openjdk',
'smartos': 'openjdk17',
'ubuntu': 'openjdk-17-jre-headless',
'ubuntu1604': 'openjdk-8-jre-headless',
'ubuntu2204': 'openjdk-17-jre-headless',
'ubuntu': 'openjdk-25-jre-headless',
}

java_package_name: "{{ packages[os]|default(packages[os|stripversion])|default(omit) }}"
Expand Down
4 changes: 2 additions & 2 deletions ansible/roles/jenkins-workspace/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -137,9 +137,9 @@
dest: /etc/apt/keyrings/nodesource-repo.gpg.asc
url: https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key

- name: Add nodesource 20 repo
- name: Add nodesource 22 repo
apt_repository:
repo: deb [arch=amd64 signed-by=/etc/apt/keyrings/nodesource-repo.gpg.asc] https://deb.nodesource.com/node_20.x nodistro main
repo: deb [arch=amd64 signed-by=/etc/apt/keyrings/nodesource-repo.gpg.asc] https://deb.nodesource.com/node_22.x nodistro main
state: present

- name: Install node
Expand Down