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.
nodejs · Oct 13, 2022 · e61ec8f · e61ec8f
1 parent 04fb086
commit e61ec8f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/ansible/roles/java-base/vars/main.yml b/ansible/roles/java-base/vars/main.yml
@@ -12,7 +12,7 @@ packages: {
   'debian10': 'openjdk-11-jre-headless',
   'fedora': 'java-17-openjdk-headless',
   'fedora32': 'java-11-openjdk-headless',
-  'freebsd': 'openjdk8-jre',
+  'freebsd': 'openjdk11-jre',
   'ibmi': 'openjdk-11-ea',
   'macos': 'adoptopenjdk8',
   'rhel7': 'java-11-openjdk',

diff --git a/ansible/roles/jenkins-worker/tasks/partials/tap2junit/freebsd.yml b/ansible/roles/jenkins-worker/tasks/partials/tap2junit/freebsd.yml
@@ -5,14 +5,19 @@
 #
 
 - name: install pip
-  package: name=py38-pip state=present
+  package:
+    name: py39-pip
+    state: present
 
 - name: freebsd | update pip3 symlink
   when: os == "freebsd12"
   file:
     dest: "/usr/local/bin/pip3"
     state: link
-    src: "/usr/local/bin/pip-3.8"
+    src: "/usr/local/bin/pip-3.9"
 
 - name: install tap2junit
-  pip: name=tap2junit state=present
+  pip:
+    executable: pip3
+    name: tap2junit
+    state: present
diff --git a/...es/package-upgrade/tasks/partials/pkg.yml → .../package-upgrade/tasks/partials/pkgng.yml b/...es/package-upgrade/tasks/partials/pkg.yml → .../package-upgrade/tasks/partials/pkgng.yml
diff --git a/ansible/roles/package-upgrade/vars/main.yml b/ansible/roles/package-upgrade/vars/main.yml
@@ -8,7 +8,7 @@
     'yum': ['centos', 'rhel7', 'aix71', 'aix72', 'ibmi'],
     'apt': ['debian', 'ubuntu'],
     'dnf': ['aix73', 'fedora', 'rhel8'],
-    'pkg': 'freebsd',
+    'pkgng': 'freebsd',
     'pkgin': 'smartos',
     'chocolatey': 'win',
     'brew': 'macos'