Skip to content

Commit e61ec8f

Browse files
committed
ansible: update freebsd12 to Java 11
Update Ansible scripts for FreeBSD 12 to update to Java 11. Also fixes issues with the scripts running with Ansible 2.11.2.
1 parent 04fb086 commit e61ec8f

4 files changed

Lines changed: 10 additions & 5 deletions

File tree

ansible/roles/java-base/vars/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ packages: {
1212
'debian10': 'openjdk-11-jre-headless',
1313
'fedora': 'java-17-openjdk-headless',
1414
'fedora32': 'java-11-openjdk-headless',
15-
'freebsd': 'openjdk8-jre',
15+
'freebsd': 'openjdk11-jre',
1616
'ibmi': 'openjdk-11-ea',
1717
'macos': 'adoptopenjdk8',
1818
'rhel7': 'java-11-openjdk',

ansible/roles/jenkins-worker/tasks/partials/tap2junit/freebsd.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,19 @@
55
#
66

77
- name: install pip
8-
package: name=py38-pip state=present
8+
package:
9+
name: py39-pip
10+
state: present
911

1012
- name: freebsd | update pip3 symlink
1113
when: os == "freebsd12"
1214
file:
1315
dest: "/usr/local/bin/pip3"
1416
state: link
15-
src: "/usr/local/bin/pip-3.8"
17+
src: "/usr/local/bin/pip-3.9"
1618

1719
- name: install tap2junit
18-
pip: name=tap2junit state=present
20+
pip:
21+
executable: pip3
22+
name: tap2junit
23+
state: present
File renamed without changes.

ansible/roles/package-upgrade/vars/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
'yum': ['centos', 'rhel7', 'aix71', 'aix72', 'ibmi'],
99
'apt': ['debian', 'ubuntu'],
1010
'dnf': ['aix73', 'fedora', 'rhel8'],
11-
'pkg': 'freebsd',
11+
'pkgng': 'freebsd',
1212
'pkgin': 'smartos',
1313
'chocolatey': 'win',
1414
'brew': 'macos'

0 commit comments

Comments
 (0)