Skip to content

Commit 8eaff55

Browse files
authored
ansible: introduce Ubuntu 24.04 test runners (#4145)
Start with a single vm from DigitalOcean to test it. Refs: #4144
1 parent 57f8937 commit 8eaff55

File tree

5 files changed

+25
-1
lines changed

5 files changed

+25
-1
lines changed

ansible/inventory.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ hosts:
109109
ubuntu1804-x64-1: {ip: 178.128.181.213}
110110
ubuntu2204-x64-1: {ip: 138.197.4.1, swap_file_size_mb: 2048}
111111
ubuntu2204-x64-2: {ip: 167.99.124.188, swap_file_size_mb: 2048}
112+
ubuntu2404-x64-1: {ip: 165.227.180.106, swap_file_size_mb: 2048}
112113

113114
- ibm:
114115
aix72-ppc64_be-1:

ansible/roles/baselayout/vars/main.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,4 +132,9 @@ packages: {
132132
ubuntu2204: [
133133
'gcc,g++,gcc-12,g++-12,python3,python-is-python3',
134134
],
135+
136+
# Default gcc/g++ package is 13.
137+
ubuntu2404: [
138+
'clang-19,gcc,g++,python3,python3-pip,python-is-python3,python3-venv',
139+
],
135140
}
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
3+
#
4+
# install tap2junit ubuntu2404
5+
#
6+
7+
- name: install tap2junit
8+
pip:
9+
name: tap2junit=={{ tap2junit_version }}
10+
virtualenv: /home/{{ server_user }}/venv
11+
virtualenv_command: python3 -m venv

ansible/roles/jenkins-worker/vars/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ init: {
99
freebsd: 'freebsd',
1010
ibmi: 'ibmi74',
1111
macos: 'macos',
12-
systemd: ['debian', 'fedora', 'rhel7', 'rhel8', 'rhel9', 'ubuntu1604', 'ubuntu1804','ubuntu2204'],
12+
systemd: ['debian', 'fedora', 'rhel7', 'rhel8', 'rhel9', 'ubuntu'],
1313
svc: 'smartos',
1414
zos_start: 'zos'
1515
}

jenkins/scripts/select-compiler.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,13 @@ if [ "$NODEJS_MAJOR_VERSION" -ge "25" ]; then
6464
echo "Compiler set to Clang" `${CXX} -dumpversion`
6565
return
6666
;;
67+
*ubuntu2404*)
68+
echo "Using Clang for Node.js $NODEJS_MAJOR_VERSION"
69+
export CC="ccache clang-19"
70+
export CXX="ccache clang++-19"
71+
echo "Compiler set to Clang" `${CXX} -dumpversion`
72+
return
73+
;;
6774
esac
6875
fi
6976

0 commit comments

Comments
 (0)