From 0d6bdbf821c28a44b90304e9ca5934e7e4c1e5aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= Date: Mon, 22 Jan 2024 08:38:58 +0100 Subject: [PATCH 1/2] ansible: replace Softlayer 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/docker/vars/main.yml | 2 +- ansible/roles/java-base/vars/main.yml | 1 - jenkins/scripts/VersionSelectorScript.groovy | 1 - 5 files changed, 3 insertions(+), 9 deletions(-) diff --git a/ansible/inventory.yml b/ansible/inventory.yml index 38c429f3a..28eb0e203 100644 --- a/ansible/inventory.yml +++ b/ansible/inventory.yml @@ -330,6 +330,6 @@ hosts: - softlayer: centos7-x64-1: {ip: 50.23.85.250} - debian9-x64-1: {ip: 169.60.150.88} debian10-x64-1: {ip: 169.44.16.126} + debian12-x64-1: {ip: 169.60.150.88} ubuntu1404-x64-1: {ip: 50.97.245.5} diff --git a/ansible/roles/baselayout/vars/main.yml b/ansible/roles/baselayout/vars/main.yml index 575815003..e1699bc7f 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', 'debian12', 'ubuntu'] + systemd: ['debian8', 'debian10', 'debian12', 'ubuntu'] } common_packages: [ @@ -63,10 +63,6 @@ packages: { 'ccache,git,gcc-4.9,g++-4.9,libfontconfig1,binutils-2.26,sudo', ], - debian9: [ - 'gcc-6,g++-6,ccache,git,curl,libfontconfig1,apt-transport-https,ca-certificates,sudo', - ], - debian10: [ 'gcc-8,g++-8,ccache,git,curl,libfontconfig1,apt-transport-https,ca-certificates,sudo,python3-pip', ], diff --git a/ansible/roles/docker/vars/main.yml b/ansible/roles/docker/vars/main.yml index 79756e964..d51fbc08b 100644 --- a/ansible/roles/docker/vars/main.yml +++ b/ansible/roles/docker/vars/main.yml @@ -9,7 +9,7 @@ ssh_config: /etc/ssh/sshd_config sshd_service_name: 'sshd' ntp_service: { - systemd: ['debian8', 'debian9', 'debian10', 'ubuntu1604', 'ubuntu1804', 'ubuntu2204'] + systemd: ['debian8', 'debian10', 'ubuntu1604', 'ubuntu1804', 'ubuntu2204'] } common_packages: [ diff --git a/ansible/roles/java-base/vars/main.yml b/ansible/roles/java-base/vars/main.yml index 6b949bda4..39c837ad9 100644 --- a/ansible/roles/java-base/vars/main.yml +++ b/ansible/roles/java-base/vars/main.yml @@ -7,7 +7,6 @@ packages: { 'centos': 'java-11-openjdk-headless', 'debian8': 'oracle-java8-installer', - 'debian9': 'openjdk-8-jre-headless', 'debian10': 'openjdk-11-jre-headless', 'debian11': 'openjdk-17-jre-headless', 'debian12': 'openjdk-17-jre-headless', diff --git a/jenkins/scripts/VersionSelectorScript.groovy b/jenkins/scripts/VersionSelectorScript.groovy index 70d545f6c..61b99fccd 100644 --- a/jenkins/scripts/VersionSelectorScript.groovy +++ b/jenkins/scripts/VersionSelectorScript.groovy @@ -24,7 +24,6 @@ def buildExclusions = [ [ /^centos7-(arm)?64-gcc6/, anyType, gte(16) ], // 14.x: gcc6 builds stop [ /^centos7-(arm)?64-gcc8/, anyType, gte(18) ], // 18.x: centos7 builds stop [ /^centos7-64/, anyType, gte(18) ], - [ /debian9/, anyType, gte(16) ], [ /debian10/, anyType, gte(21) ], [ /rhel7/, anyType, gte(18) ], [ /rhel8/, releaseType, lt(18) ], From beec6ccc0501b16dcab5d0ef347e429e2ae9e69f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= Date: Mon, 22 Jan 2024 08:57:10 +0100 Subject: [PATCH 2/2] add systemd-timesyncd --- ansible/roles/baselayout/vars/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/roles/baselayout/vars/main.yml b/ansible/roles/baselayout/vars/main.yml index e1699bc7f..7850a1fab 100644 --- a/ansible/roles/baselayout/vars/main.yml +++ b/ansible/roles/baselayout/vars/main.yml @@ -72,7 +72,7 @@ packages: { ], debian12: [ - 'gcc,g++,make,ccache,git,curl,libfontconfig1,apt-transport-https,ca-certificates,sudo,python3-venv', + 'systemd-timesyncd,gcc,g++,make,ccache,git,curl,libfontconfig1,apt-transport-https,ca-certificates,sudo,python3-venv', ], fedora: [