ansible: remove old Debian references

nodejs · Dec 22, 2024 · 8783b04 · 8783b04
1 parent 8b6d1f8
commit 8783b04
Show file tree

Hide file tree

Showing 11 changed files with 4 additions and 122 deletions.
diff --git a/ansible/README.md b/ansible/README.md
@@ -255,7 +255,6 @@ Unsorted stuff of things we need to do/think about
 - [ ] move all service-related stuff to handlers
 - [ ] find a nicer way of adding proxyhosts to iptables
 - [ ] add clang/clang++ symlinks for ccache
-- [ ] debian7 needs to update alternative gcc/g++
 - [ ] verify that /usr/local/bin works as ccache install path
 - [x] remove subversion since v8 tests uses git nowadays
 - [ ] assign 192/256mb ram to the jenkins instances that requires it:

diff --git a/ansible/roles/baselayout/files/debian8-ubuntu-trusty-apt-preferences b/ansible/roles/baselayout/files/debian8-ubuntu-trusty-apt-preferences
diff --git a/ansible/roles/baselayout/tasks/partials/repo/debian7.yml b/ansible/roles/baselayout/tasks/partials/repo/debian7.yml
diff --git a/ansible/roles/baselayout/tasks/partials/repo/debian8.yml b/ansible/roles/baselayout/tasks/partials/repo/debian8.yml
diff --git 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', 'debian12', 'ubuntu']
+  systemd: ['debian12', 'ubuntu']
 }
 
 common_packages: [
@@ -48,10 +48,6 @@ packages: {
     'autoconf,automake,ca-certificates-mozilla,tar-gnu,gzip,ccache,cmake,coreutils-gnu,gcc12,gcc12-cplusplus,gcc12-cpp,libstdcplusplus6-12-devel,gcc10,gcc10-cplusplus,gcc10-cpp,git,libstdcplusplus6-10-devel,m4-gnu,openssl-devel,python2-setuptools,python3,python3-pip,python39,python39-pip,python39-setuptools,sed-gnu,zlib-devel,icu-devel,c-ares-devel,brotli-devel,grep-gnu,pkg-config,xz',
   ],
 
-  debian8: [
-    'ccache,git,gcc-4.9,g++-4.9,libfontconfig1,binutils-2.26,sudo',
-  ],
-
   debian11: [
     'gcc-10,g++-10,ccache,git,curl,libfontconfig1,apt-transport-https,ca-certificates,sudo,python3-pip',
   ],

diff --git a/ansible/roles/bootstrap/tasks/partials/debian8.yml b/ansible/roles/bootstrap/tasks/partials/debian8.yml
diff --git a/ansible/roles/bootstrap/tasks/partials/debian9.yml b/ansible/roles/bootstrap/tasks/partials/debian9.yml
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', 'ubuntu1604', 'ubuntu1804', 'ubuntu2204', 'ubuntu2404']
+  systemd: ['ubuntu1604', 'ubuntu1804', 'ubuntu2204', 'ubuntu2404']
 }
 
 common_packages: [

diff --git a/ansible/roles/java-base/tasks/main.yml b/ansible/roles/java-base/tasks/main.yml
@@ -4,21 +4,6 @@
 # installs java
 #
 
-- name: add webupd8team oracle java repository
-  when: os == "debian8"
-  lineinfile:
-    dest: /etc/apt/sources.list
-    state: present
-    line: deb http://ppa.launchpad.net/webupd8team/java/ubuntu xenial main
-
-- name: add webupd8team oracle java repository key
-  when: os == "debian8"
-  shell: apt-key adv --keyserver keyserver.ubuntu.com --recv-keys EEA14886
-
-- name: accept webupd8 oracle java 8 license
-  when: os == "debian8"
-  debconf: name='oracle-java8-installer' question='shared/accepted-oracle-license-v1-1' value='true' vtype='select'
-
 # if this fails you want to check in vars/main.yml and add package name
 # as appropriate -- try to use generic os family if available.
 
@@ -72,7 +57,7 @@
   file:
     path: "/var/cache/adoptopenjdk-binaries"
     state: directory
-  when: 
+  when:
     - use_adoptopenjdk == True
     - update_adoptopenjdk == True
 
@@ -104,7 +89,7 @@
   register: adoptopenjdk_symlink
   stat:
     path: "/usr/bin/java"
-  when: 
+  when:
     - use_adoptopenjdk == True
     - update_adoptopenjdk == True
 

diff --git a/ansible/roles/java-base/vars/main.yml b/ansible/roles/java-base/vars/main.yml
@@ -6,7 +6,6 @@
 
 packages: {
   'centos': 'java-11-openjdk-headless',
-  'debian8': 'oracle-java8-installer',
   'debian11': 'openjdk-17-jre-headless',
   'debian12': 'openjdk-17-jre-headless',
   'fedora': 'java-17-openjdk-headless',

diff --git a/doc/node-test-commit-matrix.md b/doc/node-test-commit-matrix.md
@@ -16,9 +16,6 @@ This is assumed correct as of the date of last commit. If you notice a discrepan
   - **node-test-commit-linux**
     - alpine-last-latest-x64
     - alpine-latest-x64
-    - debian8-64
-    - debian8-x86 (Node < 10)
-    - debian9-64
     - fedora-last-latest-x64
     - fedora-latest-x64
     - ubuntu1604-32 (Node < 10)
@@ -59,9 +56,6 @@ This is assumed correct as of the date of last commit. If you notice a discrepan
     - ubuntu1604_sharedlibs_zlib_x64
       1. `CONFIG_FLAGS="$CONFIG_FLAGS --shared-zlib --shared-zlib-includes=${ZLIB12DIR}/include/ --shared-zlib-libpath=${ZLIB12DIR}/lib/" make run-ci -j $JOBS` (ZLIB12DIR points to a pre-build of zlib 1.2)
   - **node-test-commit-arm**
-    - debian7-docker-armv7 (Node < 10)
-    - debian8-docker-armv7 (Node < 12)
-    - debian9-docker-armv7 (Node >= 10)
     - ubuntu1604-arm64 
   - **node-test-commit-linuxone**
     - rhel7-s390x (Node >= 6)