From e728c311dd72f423756cc44250d999ee7efe7337 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= Date: Sun, 5 Nov 2023 07:32:17 +0100 Subject: [PATCH] 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 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ansible/inventory.yml b/ansible/inventory.yml index 79303d49f..fe7850ff5 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 33815ba71..580c0b259 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', 'ubuntu1604', 'ubuntu1804'] + systemd: ['debian8', 'debian9', 'debian10', 'debian12', 'ubuntu1604', 'ubuntu1804'] } 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-12,g++-12,ccache,git,curl,libfontconfig1,apt-transport-https,ca-certificates,sudo,python3-pip', + ], + 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',