Skip to content

ansible: update FreeBSD 11->12 #2774

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 29, 2021
Merged

ansible: update FreeBSD 11->12 #2774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion ansible.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ ansible_python_interpreter = /usr/bin/python3
ansible_python_interpreter = /opt/local/bin/python

[hosts:freebsd]
ansible_python_interpreter = /usr/local/bin/python
ansible_python_interpreter = /usr/local/bin/python3

[hosts:fedora32]
ansible_python_interpreter = /usr/bin/python3
Expand Down
4 changes: 2 additions & 2 deletions ansible/inventory.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
freebsd12-x64-2: {ip: 107.170.28.213, 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}
Expand Down
2 changes: 1 addition & 1 deletion ansible/roles/baselayout/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ansible/roles/baselayout/vars/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ packages: {
],

freebsd: [
'ccache,git,gmake,sudo,python3'
'ccache,git,gmake,sudo,python2,python3'
],

'macos10.10': [
Expand Down
2 changes: 1 addition & 1 deletion ansible/roles/jenkins-worker/tasks/partials/tap2junit/freebsd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down