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 DO ubuntu1604-x86 hosts with ubuntu2204-x64 #3561

Merged
merged 2 commits into from
Nov 7, 2023
Merged

ansible: replace DO ubuntu1604-x86 hosts with ubuntu2204-x64 #3561

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
295204c
ansible: replace DO ubuntu1604-x86 hosts with ubuntu2204-x64
targos Nov 6, 2023
83a509e
wip
targos Nov 6, 2023
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
4 changes: 2 additions & 2 deletions ansible/inventory.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,11 +129,11 @@ hosts:
freebsd12-x64-1: {ip: 45.55.90.237, user: freebsd}
freebsd12-x64-2: {ip: 107.170.28.213, user: freebsd}
rhel8-x64-1: {ip: 161.35.139.78, build_test_v8: yes}
ubuntu1604-x86-1: {ip: 159.203.77.233}
ubuntu1604-x86-2: {ip: 104.131.191.135}
ubuntu1804_docker-x64-1: {ip: 134.209.55.216}
ubuntu1804_docker-x64-2: {ip: 159.89.183.200}
ubuntu1804-x64-1: {ip: 178.128.181.213}
ubuntu2204-x64-1: {ip: 138.197.4.1}
ubuntu2204-x64-2: {ip: 167.99.124.188}

- equinix:
ubuntu2004_docker-arm64-1: {ip: 145.40.81.219}
Expand Down
5 changes: 3 additions & 2 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', 'ubuntu1604', 'ubuntu1804']
systemd: ['debian8', 'debian9', 'debian10', 'ubuntu']
}

common_packages: [
Expand Down Expand Up @@ -143,7 +143,8 @@ packages: {
'gcc-6,g++-6,gcc-8,g++-8,python3.8',
],

# Default gcc/g++ package is 11.
ubuntu2204: [
'gcc,g++,python2,python3,python-is-python3',
'gcc,g++,python3,python-is-python3',
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We shouldn't need python2 anymore, right?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correct. In theory just Python 3 should work. I'm not even sure we need python-is-python3.

],
}