Skip to content

Commit 117f8bf

Browse files
authored
ansible: remove old Debian references (#3990)
1 parent 9b64b06 commit 117f8bf

File tree

11 files changed

+4
-122
lines changed

11 files changed

+4
-122
lines changed

ansible/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,6 @@ Unsorted stuff of things we need to do/think about
255255
- [ ] move all service-related stuff to handlers
256256
- [ ] find a nicer way of adding proxyhosts to iptables
257257
- [ ] add clang/clang++ symlinks for ccache
258-
- [ ] debian7 needs to update alternative gcc/g++
259258
- [ ] verify that /usr/local/bin works as ccache install path
260259
- [x] remove subversion since v8 tests uses git nowadays
261260
- [ ] assign 192/256mb ram to the jenkins instances that requires it:

ansible/roles/baselayout/files/debian8-ubuntu-trusty-apt-preferences

Lines changed: 0 additions & 3 deletions
This file was deleted.

ansible/roles/baselayout/tasks/partials/repo/debian7.yml

Lines changed: 0 additions & 13 deletions
This file was deleted.

ansible/roles/baselayout/tasks/partials/repo/debian8.yml

Lines changed: 0 additions & 37 deletions
This file was deleted.

ansible/roles/baselayout/vars/main.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ sshd_service_name: "{{ sshd_service_map[os]|default(sshd_service_map[os|stripver
1818

1919
ntp_service: {
2020
chrony: ['rhel8', 'rhel9', 'debian11'],
21-
systemd: ['debian8', 'debian12', 'ubuntu']
21+
systemd: ['debian12', 'ubuntu']
2222
}
2323

2424
common_packages: [
@@ -48,10 +48,6 @@ packages: {
4848
'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',
4949
],
5050

51-
debian8: [
52-
'ccache,git,gcc-4.9,g++-4.9,libfontconfig1,binutils-2.26,sudo',
53-
],
54-
5551
debian11: [
5652
'gcc-10,g++-10,ccache,git,curl,libfontconfig1,apt-transport-https,ca-certificates,sudo,python3-pip',
5753
],

ansible/roles/bootstrap/tasks/partials/debian8.yml

Lines changed: 0 additions & 23 deletions
This file was deleted.

ansible/roles/bootstrap/tasks/partials/debian9.yml

Lines changed: 0 additions & 15 deletions
This file was deleted.

ansible/roles/docker/vars/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ssh_config: /etc/ssh/sshd_config
99
sshd_service_name: 'sshd'
1010

1111
ntp_service: {
12-
systemd: ['debian8', 'ubuntu1604', 'ubuntu1804', 'ubuntu2204', 'ubuntu2404']
12+
systemd: ['ubuntu1604', 'ubuntu1804', 'ubuntu2204', 'ubuntu2404']
1313
}
1414

1515
common_packages: [

ansible/roles/java-base/tasks/main.yml

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,6 @@
44
# installs java
55
#
66

7-
- name: add webupd8team oracle java repository
8-
when: os == "debian8"
9-
lineinfile:
10-
dest: /etc/apt/sources.list
11-
state: present
12-
line: deb http://ppa.launchpad.net/webupd8team/java/ubuntu xenial main
13-
14-
- name: add webupd8team oracle java repository key
15-
when: os == "debian8"
16-
shell: apt-key adv --keyserver keyserver.ubuntu.com --recv-keys EEA14886
17-
18-
- name: accept webupd8 oracle java 8 license
19-
when: os == "debian8"
20-
debconf: name='oracle-java8-installer' question='shared/accepted-oracle-license-v1-1' value='true' vtype='select'
21-
227
# if this fails you want to check in vars/main.yml and add package name
238
# as appropriate -- try to use generic os family if available.
249

@@ -72,7 +57,7 @@
7257
file:
7358
path: "/var/cache/adoptopenjdk-binaries"
7459
state: directory
75-
when:
60+
when:
7661
- use_adoptopenjdk == True
7762
- update_adoptopenjdk == True
7863

@@ -104,7 +89,7 @@
10489
register: adoptopenjdk_symlink
10590
stat:
10691
path: "/usr/bin/java"
107-
when:
92+
when:
10893
- use_adoptopenjdk == True
10994
- update_adoptopenjdk == True
11095

ansible/roles/java-base/vars/main.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
packages: {
88
'centos': 'java-11-openjdk-headless',
9-
'debian8': 'oracle-java8-installer',
109
'debian11': 'openjdk-17-jre-headless',
1110
'debian12': 'openjdk-17-jre-headless',
1211
'fedora': 'java-17-openjdk-headless',

doc/node-test-commit-matrix.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@ This is assumed correct as of the date of last commit. If you notice a discrepan
1616
- **node-test-commit-linux**
1717
- alpine-last-latest-x64
1818
- alpine-latest-x64
19-
- debian8-64
20-
- debian8-x86 (Node < 10)
21-
- debian9-64
2219
- fedora-last-latest-x64
2320
- fedora-latest-x64
2421
- ubuntu1604-32 (Node < 10)
@@ -59,9 +56,6 @@ This is assumed correct as of the date of last commit. If you notice a discrepan
5956
- ubuntu1604_sharedlibs_zlib_x64
6057
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)
6158
- **node-test-commit-arm**
62-
- debian7-docker-armv7 (Node < 10)
63-
- debian8-docker-armv7 (Node < 12)
64-
- debian9-docker-armv7 (Node >= 10)
6559
- ubuntu1604-arm64
6660
- **node-test-commit-linuxone**
6761
- rhel7-s390x (Node >= 6)

0 commit comments

Comments
 (0)