From 3834ade3c42911b9f37e76a35b30cb8642b5d2af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= Date: Wed, 18 Dec 2024 13:42:00 +0100 Subject: [PATCH] ansible,jenkins: remove Debian 10 test hosts Refs: https://github.com/nodejs/build/issues/3916 --- ansible/inventory.yml | 2 -- ansible/roles/baselayout/tasks/main.yml | 7 ------- 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 - 6 files changed, 2 insertions(+), 17 deletions(-) diff --git a/ansible/inventory.yml b/ansible/inventory.yml index 4db319710..705141927 100644 --- a/ansible/inventory.yml +++ b/ansible/inventory.yml @@ -300,7 +300,6 @@ hosts: server_jobs: 32 - rackspace: - debian10-x64-1: {ip: 104.239.140.184} debian11-x64-1: {ip: 23.253.109.216, swap_file_size_mb: 4096} debian12-x64-1: {ip: 104.130.124.194, swap_file_size_mb: 4096} ubuntu2204-x64-1: {ip: 119.9.52.75, swap_file_size_mb: 4096, user: ubuntu} @@ -318,5 +317,4 @@ hosts: win2022_vs2022-x64-6: {} - softlayer: - debian10-x64-1: {ip: 169.44.16.126} debian12-x64-1: {ip: 169.60.150.88, swap_file_size_mb: 2048} diff --git a/ansible/roles/baselayout/tasks/main.yml b/ansible/roles/baselayout/tasks/main.yml index 4f333f247..a4f24dbb8 100644 --- a/ansible/roles/baselayout/tasks/main.yml +++ b/ansible/roles/baselayout/tasks/main.yml @@ -167,10 +167,3 @@ - "{{ role_path }}/tasks/partials/ntp/{{ os|stripversion }}.yml" - "{{ role_path }}/tasks/partials/ntp/{{ os|match_key(ntp_service, raise_error=False) }}.yml" skip: true - -- name: reset default OpenSSL security level - ansible.builtin.replace: - path: /etc/ssl/openssl.cnf - regexp: "SECLEVEL=2" - replace: "SECLEVEL=1" - when: "os == 'debian10'" diff --git a/ansible/roles/baselayout/vars/main.yml b/ansible/roles/baselayout/vars/main.yml index 4b98ae855..6e5f5eaff 100644 --- a/ansible/roles/baselayout/vars/main.yml +++ b/ansible/roles/baselayout/vars/main.yml @@ -18,7 +18,7 @@ sshd_service_name: "{{ sshd_service_map[os]|default(sshd_service_map[os|stripver ntp_service: { chrony: ['rhel8', 'rhel9', 'debian11'], - systemd: ['debian8', 'debian10', 'debian12', 'ubuntu'] + systemd: ['debian8', 'debian12', 'ubuntu'] } common_packages: [ @@ -52,10 +52,6 @@ packages: { 'ccache,git,gcc-4.9,g++-4.9,libfontconfig1,binutils-2.26,sudo', ], - debian10: [ - 'gcc-8,g++-8,ccache,git,curl,libfontconfig1,apt-transport-https,ca-certificates,sudo,python3-pip', - ], - debian11: [ 'gcc-10,g++-10,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 b733647be..9d6de7b05 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', 'debian10', 'ubuntu1604', 'ubuntu1804', 'ubuntu2204', 'ubuntu2404'] + systemd: ['debian8', 'ubuntu1604', 'ubuntu1804', 'ubuntu2204', 'ubuntu2404'] } common_packages: [ diff --git a/ansible/roles/java-base/vars/main.yml b/ansible/roles/java-base/vars/main.yml index a0e55104d..f4ef4e5b2 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', - 'debian10': 'openjdk-11-jre-headless', 'debian11': 'openjdk-17-jre-headless', 'debian12': 'openjdk-17-jre-headless', 'fedora': 'java-17-openjdk-headless', diff --git a/jenkins/scripts/VersionSelectorScript.groovy b/jenkins/scripts/VersionSelectorScript.groovy index 1750b836a..6dfc12984 100644 --- a/jenkins/scripts/VersionSelectorScript.groovy +++ b/jenkins/scripts/VersionSelectorScript.groovy @@ -20,7 +20,6 @@ def buildExclusions = [ // Machine Label, Build Type, Node Version // Linux ------------------------------------------------- - [ /debian10/, anyType, gte(21) ], [ /debian11/, anyType, gte(23) ], [ /alpine-last-latest/, anyType, gte(22) ], // Alpine 3.18. Bug in GCC 12.2. [ /rhel7/, anyType, gte(18) ],