ansible: replace Softlayer debian9-x64-1 with debian12-x64-1 (#3613)

Refs: #3499
nodejs · Jan 22, 2024 · 445a987 · 445a987
1 parent 172558b
commit 445a987
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 10 deletions.
diff --git 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
@@ -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',
   ],
@@ -76,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: [

diff --git 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
@@ -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
@@ -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)  ],