ansible: update FreeBSD 11->12

Updates our FreeBSD hosts from FreeBSD 11 to FreeBSD 12.
nodejs · Sep 28, 2021 · 47caf3b · 47caf3b
1 parent 5c51c04
commit 47caf3b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/ansible/inventory.yml b/ansible/inventory.yml
@@ -131,8 +131,8 @@ hosts:
         fedora32-x64-1: {ip: 159.203.117.50}
         fedora34-x64-1: {ip: 178.62.236.249}
         fedora34-x64-2: {ip: 159.203.98.84}
-        freebsd11-x64-1: {ip: 45.55.90.237, user: freebsd}
         freebsd11-x64-2: {ip: 107.170.28.213, user: freebsd}
+        freebsd12-x64-1: {ip: 45.55.90.237, user: freebsd}
         ubuntu1404-x64-1: {ip: 45.55.252.223}
         ubuntu1404-x86-1: {ip: 159.203.115.220}
         ubuntu1604-x86-1: {ip: 159.203.77.233}

diff --git a/ansible/roles/baselayout/tasks/main.yml b/ansible/roles/baselayout/tasks/main.yml
@@ -135,7 +135,7 @@
     path: "/usr/bin/python3.7"
 
 - name: freebsd | update python package alternatives
-  when: os == "freebsd11"
+  when: os == "freebsd12"
   file:
     dest: "/usr/local/bin/python"
     state: link

diff --git a/ansible/roles/baselayout/vars/main.yml b/ansible/roles/baselayout/vars/main.yml
@@ -99,7 +99,7 @@ packages: {
   ],
 
   freebsd: [
-    'ccache,git,gmake,sudo,python3'
+    'ccache,git,gmake,sudo,python2,python3'
   ],
 
   'macos10.10': [

diff --git a/ansible/roles/jenkins-worker/tasks/partials/tap2junit/freebsd.yml b/ansible/roles/jenkins-worker/tasks/partials/tap2junit/freebsd.yml
@@ -8,7 +8,7 @@
   package: name=py38-pip state=present
 
 - name: freebsd | update pip3 symlink
-  when: os == "freebsd11"
+  when: os == "freebsd12"
   file:
     dest: "/usr/local/bin/pip3"
     state: link