From 957f037ed9e4cc9f3d36e995b399701cea7c40f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= Date: Wed, 3 Jan 2024 21:52:06 +0100 Subject: [PATCH] ansible: replace DO debian9-x64-1 with debian12-x64-1 (#3560) ansible: replace DO debian9-x64-1 with debian12-x64-1 Refs: https://github.com/nodejs/build/issues/3499 --- ansible/inventory.yml | 2 +- ansible/roles/baselayout/vars/main.yml | 6 +++++- ansible/roles/java-base/vars/main.yml | 1 + .../tasks/partials/tap2junit/debian12.yml | 11 +++++++++++ .../roles/jenkins-worker/templates/systemd.service.j2 | 2 +- 5 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 ansible/roles/jenkins-worker/tasks/partials/tap2junit/debian12.yml diff --git a/ansible/inventory.yml b/ansible/inventory.yml index 7d67c89c8..38c429f3a 100644 --- a/ansible/inventory.yml +++ b/ansible/inventory.yml @@ -121,7 +121,7 @@ hosts: - digitalocean: debian11-x64-1: {ip: 174.138.79.159} - debian9-x64-1: {ip: 138.197.97.208} + debian12-x64-1: {ip: 159.203.105.159} fedora32-x64-1: {ip: 159.203.117.50} fedora37-x64-1: {ip: 159.65.248.149} fedora38-x64-1: {ip: 162.243.187.89} diff --git a/ansible/roles/baselayout/vars/main.yml b/ansible/roles/baselayout/vars/main.yml index e29ad37e2..575815003 100644 --- a/ansible/roles/baselayout/vars/main.yml +++ b/ansible/roles/baselayout/vars/main.yml @@ -17,7 +17,7 @@ sshd_service_name: "{{ sshd_service_map[os]|default(sshd_service_map[os|stripver ntp_service: { chrony: ['rhel8', 'debian11'], - systemd: ['debian8', 'debian9', 'debian10', 'ubuntu'] + systemd: ['debian8', 'debian9', 'debian10', 'debian12', 'ubuntu'] } common_packages: [ @@ -75,6 +75,10 @@ packages: { 'gcc-10,g++-10,ccache,git,curl,libfontconfig1,apt-transport-https,ca-certificates,sudo,python3-pip', ], + debian12: [ + 'gcc,g++,make,ccache,git,curl,libfontconfig1,apt-transport-https,ca-certificates,sudo,python3-venv', + ], + fedora: [ 'bzip2,ccache,gcc-c++,git,fontconfig,sudo,make,python3-pip', ], diff --git a/ansible/roles/java-base/vars/main.yml b/ansible/roles/java-base/vars/main.yml index 4c2191f9b..6b949bda4 100644 --- a/ansible/roles/java-base/vars/main.yml +++ b/ansible/roles/java-base/vars/main.yml @@ -10,6 +10,7 @@ packages: { 'debian9': 'openjdk-8-jre-headless', 'debian10': 'openjdk-11-jre-headless', 'debian11': 'openjdk-17-jre-headless', + 'debian12': 'openjdk-17-jre-headless', 'fedora': 'java-17-openjdk-headless', 'fedora32': 'java-11-openjdk-headless', 'freebsd': 'openjdk11-jre', diff --git a/ansible/roles/jenkins-worker/tasks/partials/tap2junit/debian12.yml b/ansible/roles/jenkins-worker/tasks/partials/tap2junit/debian12.yml new file mode 100644 index 000000000..65191d3ce --- /dev/null +++ b/ansible/roles/jenkins-worker/tasks/partials/tap2junit/debian12.yml @@ -0,0 +1,11 @@ +--- + +# +# install tap2junit from pip +# + +- name: install tap2junit + pip: + name: tap2junit=={{ tap2junit_version }} + virtualenv: /home/{{ server_user }}/venv + virtualenv_command: python3 -m venv diff --git a/ansible/roles/jenkins-worker/templates/systemd.service.j2 b/ansible/roles/jenkins-worker/templates/systemd.service.j2 index d0a01d3a2..3a6a7ce86 100644 --- a/ansible/roles/jenkins-worker/templates/systemd.service.j2 +++ b/ansible/roles/jenkins-worker/templates/systemd.service.j2 @@ -18,7 +18,7 @@ Environment="USER={{ server_user }}" Environment="JOBS={{ jobs_env }}" Environment="SHELL=/bin/bash" Environment="HOME=/home/{{ server_user }}" -Environment="PATH=/home/{{ server_user }}/nghttp2/src:/home/{{ server_user }}/wrk:/usr/lib/ccache:/usr/lib64/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" +Environment="PATH=/home/{{ server_user }}/venv/bin:/home/{{ server_user }}/nghttp2/src:/home/{{ server_user }}/wrk:/usr/lib/ccache:/usr/lib64/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" Environment="NODE_COMMON_PIPE=/home/{{ server_user }}/test.pipe" Environment="NODE_TEST_DIR=/home/{{ server_user }}/tmp" Environment="OSTYPE=linux-gnu"