Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 2 commits into from
Jan 22, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d6bdbf
ansible: replace Softlayer debian9-x64-1 with debian12-x64-1
targos Jan 22, 2024
beec6cc
add systemd-timesyncd
targos Jan 22, 2024
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: 1 addition & 1 deletion ansible/inventory.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
8 changes: 2 additions & 6 deletions ansible/roles/baselayout/vars/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: [
Expand Down Expand Up @@ -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',
],
Expand All @@ -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: [
Expand Down
2 changes: 1 addition & 1 deletion ansible/roles/docker/vars/main.yml
View file
Open in desktop
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', 'debian9', 'debian10', 'ubuntu1604', 'ubuntu1804', 'ubuntu2204']
systemd: ['debian8', 'debian10', 'ubuntu1604', 'ubuntu1804', 'ubuntu2204']
}

common_packages: [
Expand Down
1 change: 0 additions & 1 deletion ansible/roles/java-base/vars/main.yml
View file
Open in desktop
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',
'debian9': 'openjdk-8-jre-headless',
'debian10': 'openjdk-11-jre-headless',
'debian11': 'openjdk-17-jre-headless',
'debian12': 'openjdk-17-jre-headless',
Expand Down
1 change: 0 additions & 1 deletion jenkins/scripts/VersionSelectorScript.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) ],
Expand Down