Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions ansible/inventory.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand All @@ -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}
7 changes: 0 additions & 7 deletions ansible/roles/baselayout/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'"
6 changes: 1 addition & 5 deletions ansible/roles/baselayout/vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: [
Expand Down Expand Up @@ -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',
],
Expand Down
2 changes: 1 addition & 1 deletion ansible/roles/docker/vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: [
Expand Down
1 change: 0 additions & 1 deletion ansible/roles/java-base/vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
1 change: 0 additions & 1 deletion jenkins/scripts/VersionSelectorScript.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -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) ],
Expand Down