Skip to content

Commit

Permalink
ansible: replace debian8-x64-1 with debian11-x64-1
Browse files Browse the repository at this point in the history
Refs: #3499
  • Loading branch information
targos committed Nov 5, 2023
1 parent e3df25d commit de0e070
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 14 deletions.
2 changes: 1 addition & 1 deletion ansible/inventory.yml
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ hosts:
msft-win2022_vs2019-x64-4: {ip: nodejs2.eastus.cloudapp.azure.com}

- digitalocean:
debian8-x64-1: {ip: 159.203.103.52}
debian11-x64-1: {ip: 174.138.79.159}
debian9-x64-1: {ip: 138.197.97.208}
fedora32-x64-1: {ip: 159.203.117.50}
fedora37-x64-1: {ip: 159.65.248.149}
Expand Down
6 changes: 5 additions & 1 deletion ansible/roles/baselayout/vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ sshd_service_map: {
sshd_service_name: "{{ sshd_service_map[os]|default(sshd_service_map[os|stripversion])|default('sshd') }}"

ntp_service: {
chrony: ['rhel8'],
chrony: ['rhel8', 'debian11'],
systemd: ['debian8', 'debian9', 'debian10', 'ubuntu1604', 'ubuntu1804']
}

Expand Down Expand Up @@ -71,6 +71,10 @@ packages: {
'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',
],

fedora: [
'bzip2,ccache,gcc-c++,git,fontconfig,sudo,make,python3-pip',
],
Expand Down
1 change: 1 addition & 0 deletions ansible/roles/java-base/vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ packages: {
'debian8': 'oracle-java8-installer',
'debian9': 'openjdk-8-jre-headless',
'debian10': 'openjdk-11-jre-headless',
'debian11': 'openjdk-17-jre-headless',
'fedora': 'java-17-openjdk-headless',
'fedora32': 'java-11-openjdk-headless',
'freebsd': 'openjdk11-jre',
Expand Down
11 changes: 0 additions & 11 deletions ansible/roles/jenkins-worker/tasks/partials/tap2junit/debian.yml

This file was deleted.

2 changes: 1 addition & 1 deletion ansible/roles/jenkins-worker/vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ init: {
freebsd: 'freebsd',
ibmi: 'ibmi73',
macos: 'macos',
systemd: ['centos7', 'debian8', 'debian9', 'debian10', 'fedora', 'rhel7', 'rhel8', 'ubuntu1604', 'ubuntu1804','ubuntu2204'],
systemd: ['centos7', 'debian', 'fedora', 'rhel7', 'rhel8', 'ubuntu1604', 'ubuntu1804','ubuntu2204'],
svc: 'smartos',
zos_start: 'zos'
}
Expand Down

0 comments on commit de0e070

Please sign in to comment.