From 7172ec319d37ef2a4aa0027bf6f663f82973e4fe Mon Sep 17 00:00:00 2001 From: Richard Lau Date: Fri, 27 Sep 2024 19:03:26 +0100 Subject: [PATCH] ansible: add test-digitalocean-freebsd13-x64-1 --- ansible.cfg | 1 + ansible/inventory.yml | 1 + ansible/roles/baselayout/vars/main.yml | 2 +- .../roles/bootstrap/tasks/partials/freebsd.yml | 15 --------------- ansible/roles/java-base/vars/main.yml | 2 +- .../tasks/partials/tap2junit/freebsd.yml | 8 ++++---- 6 files changed, 8 insertions(+), 21 deletions(-) delete mode 100644 ansible/roles/bootstrap/tasks/partials/freebsd.yml diff --git a/ansible.cfg b/ansible.cfg index 76f6d9edb..742d4d299 100644 --- a/ansible.cfg +++ b/ansible.cfg @@ -29,6 +29,7 @@ ansible_python_interpreter = /opt/local/bin/python [hosts:freebsd] ansible_python_interpreter = /usr/local/bin/python3 +ansible_shell_allow_world_readable_temp = True [hosts:ibm] become_method = sudo diff --git a/ansible/inventory.yml b/ansible/inventory.yml index aec99ff9e..9442f2a8d 100644 --- a/ansible/inventory.yml +++ b/ansible/inventory.yml @@ -122,6 +122,7 @@ hosts: fedora40-x64-2: {ip: 162.243.187.89} freebsd12-x64-1: {ip: 45.55.90.237, user: freebsd} freebsd12-x64-2: {ip: 107.170.28.213, user: freebsd} + freebsd13-x64-1: {ip: 138.197.25.49, user: freebsd} rhel8-x64-1: {ip: 161.35.139.78, build_test_v8: yes, swap_file_size_mb: 2048} rhel9-x64-1: {ip: 134.122.12.240, swap_file_size_mb: 2048} ubuntu2204_docker-x64-1: {ip: 134.209.55.216} diff --git a/ansible/roles/baselayout/vars/main.yml b/ansible/roles/baselayout/vars/main.yml index 29b7e6097..808b7b0d6 100644 --- a/ansible/roles/baselayout/vars/main.yml +++ b/ansible/roles/baselayout/vars/main.yml @@ -81,7 +81,7 @@ packages: { ], freebsd: [ - 'ccache,git,gmake,sudo,python2,python3' + 'ccache,git,gmake,sudo,python3' ], 'macos10.15': [ diff --git a/ansible/roles/bootstrap/tasks/partials/freebsd.yml b/ansible/roles/bootstrap/tasks/partials/freebsd.yml deleted file mode 100644 index 70437d041..000000000 --- a/ansible/roles/bootstrap/tasks/partials/freebsd.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- - -# -# generic freebsd python check -# - -- name: check for python - raw: stat /usr/local/bin/python - check_mode: no - register: has_python - failed_when: has_python.rc > 1 - -- name: install python - raw: pkg install -y python - when: has_python.rc == 1 diff --git a/ansible/roles/java-base/vars/main.yml b/ansible/roles/java-base/vars/main.yml index be9e8abf2..5d8f2f771 100644 --- a/ansible/roles/java-base/vars/main.yml +++ b/ansible/roles/java-base/vars/main.yml @@ -11,7 +11,7 @@ packages: { 'debian11': 'openjdk-17-jre-headless', 'debian12': 'openjdk-17-jre-headless', 'fedora': 'java-17-openjdk-headless', - 'freebsd': 'openjdk11-jre', + 'freebsd': 'openjdk17-jre', 'ibmi': 'openjdk-11-ea', 'macos': 'temurin17', '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 index e836fc8be..dcc338ab5 100644 --- a/ansible/roles/jenkins-worker/tasks/partials/tap2junit/freebsd.yml +++ b/ansible/roles/jenkins-worker/tasks/partials/tap2junit/freebsd.yml @@ -1,20 +1,20 @@ --- # -# freebsd: python3.8 +# freebsd13: python3.11 # - name: install pip package: - name: py39-pip + name: py311-pip state: present - name: freebsd | update pip3 symlink - when: os == "freebsd12" + when: os == "freebsd13" file: dest: "/usr/local/bin/pip3" state: link - src: "/usr/local/bin/pip-3.9" + src: "/usr/local/bin/pip-3.11" - name: install tap2junit pip: