Skip to content

Commit 522b933

Browse files
authored
ansible: install cargo/rustc on Debian and Ubuntu (#4288)
Install cargo/rustc on Debian 13 and Ubuntu 24.04 machines used for Node.js 26 onwards. Replace Debian 11 x64 with Debian 13 x64. Update `select-compiler.sh` to pick clang-19 on Debian 13 and set environment variable for cargo/rustc on Ubuntu 24.04. Refs: #4245 Refs: #4282
1 parent 7c370dd commit 522b933

8 files changed

Lines changed: 28 additions & 11 deletions

File tree

ansible/inventory.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,9 @@ hosts:
9393
ubuntu2404_docker-arm64-3: {ip: 20.172.67.207, user: nodejs}
9494

9595
- digitalocean:
96-
debian11-x64-1: {ip: 174.138.79.159, swap_file_size_mb: 2048}
9796
debian12-x64-1: {ip: 159.203.105.159, swap_file_size_mb: 2048}
97+
debian13-x64-1: {ip: 174.138.79.159, swap_file_size_mb: 2048}
98+
debian13-x64-2: {ip: 137.184.225.39, swap_file_size_mb: 2048}
9899
fedora42-x64-1: {ip: 174.138.62.120}
99100
fedora42-x64-2: {ip: 104.131.92.208}
100101
fedora43-x64-1: {ip: 165.227.191.35}
@@ -106,7 +107,6 @@ hosts:
106107
ubuntu2204_docker-x64-1: {ip: 134.209.55.216}
107108
ubuntu2204_docker-x64-2: {ip: 159.89.183.200}
108109
ubuntu2404-x64-1: {ip: 165.227.180.106, swap_file_size_mb: 2048}
109-
ubuntu2404-x64-2: {ip: 167.99.124.188, swap_file_size_mb: 2048}
110110

111111
- ibm:
112112
aix72-ppc64_be-1:
@@ -266,9 +266,9 @@ hosts:
266266
server_jobs: 32
267267

268268
- rackspace:
269-
debian11-x64-1: {ip: 23.253.109.216, swap_file_size_mb: 4096}
270269
debian12-x64-1: {ip: 104.130.124.194, swap_file_size_mb: 4096}
271270
ubuntu2404-x64-1: {ip: 119.9.52.75, swap_file_size_mb: 4096, user: ubuntu}
271+
ubuntu2404-x64-2: {ip: 104.130.124.245, swap_file_size_mb: 4096, user: ubuntu}
272272
win2016_vs2015-x64-1: {}
273273
win2016_vs2015-x64-2: {}
274274
win2019_vs2019-x64-1: {}

ansible/roles/baselayout/vars/main.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,14 @@ packages: {
5454
'autoconf,automake,ca-certificates-mozilla,tar-gnu,gzip,ccache,cmake,coreutils-gnu,gcc12,gcc12-cplusplus,gcc12-cpp,libstdcplusplus6-12-devel,gcc10,gcc10-cplusplus,gcc10-cpp,git,libstdcplusplus6-10-devel,m4-gnu,openssl-devel,python2-setuptools,python3,python3-pip,python39,python39-pip,python39-setuptools,python3.13,python3.13-pip,python3.13-setuptools,sed-gnu,zlib-devel,icu-devel,c-ares-devel,brotli-devel,grep-gnu,pkg-config,xz',
5555
],
5656

57-
debian11: [
58-
'gcc-10,g++-10,ccache,git,curl,libfontconfig1,apt-transport-https,ca-certificates,sudo,python3-pip',
59-
],
60-
6157
debian12: [
6258
'systemd-timesyncd,clang-19,gcc,g++,make,ccache,git,curl,libfontconfig1,apt-transport-https,ca-certificates,sudo,python3-venv',
6359
],
6460

61+
debian13: [
62+
'apt-transport-https,ca-certificates,cargo,clang-19,gcc,g++,make,ccache,git,curl,libfontconfig1,python3-packaging,python3-venv,rustc,sudo,systemd-timesyncd',
63+
],
64+
6565
fedora: [
6666
'bzip2,ccache,clang,gcc-c++,git,fontconfig,sudo,make,python3-pip,python3-setuptools,rust,cargo',
6767
],
@@ -141,6 +141,6 @@ packages: {
141141

142142
# Default gcc/g++ package is 13.
143143
ubuntu2404: [
144-
'clang-19,gcc,g++,python3,python3-pip,python-is-python3,python3-venv',
144+
'cargo-1.82,clang-19,gcc,g++,python3,python3-pip,python-is-python3,python3-venv,rustc-1.82',
145145
],
146146
}

ansible/roles/bootstrap/tasks/partials/debian11.yml renamed to ansible/roles/bootstrap/tasks/partials/debian13.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22

33
#
4-
# debian 11
4+
# debian 13
55
#
66

77
- name: set up swap on Linux

ansible/roles/docker/templates/ubuntu2404.Dockerfile.j2

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ RUN apt-get update && apt-get dist-upgrade -y && apt-get install -y \
1919
g++ \
2020
gcc \
2121
clang-19 \
22+
cargo-1.82 \
23+
rustc-1.82 \
2224
git \
2325
openjdk-21-jre-headless \
2426
curl \

ansible/roles/docker/templates/ubuntu2404_sharedlibs.Dockerfile.j2

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ RUN apt-get update && apt-get install apt-utils -y && \
2020
g++ \
2121
gcc \
2222
clang-19 \
23+
cargo-1.82 \
24+
rustc-1.82 \
2325
git \
2426
openjdk-21-jre-headless \
2527
pkg-config \

ansible/roles/java-base/vars/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
packages: {
88
'centos': 'java-11-openjdk-headless',
9-
'debian11': 'openjdk-17-jre-headless',
109
'debian12': 'openjdk-17-jre-headless',
10+
'debian13': 'openjdk-25-jre-headless',
1111
'fedora42': 'java-21-openjdk-headless',
1212
'fedora43': 'java-25-openjdk-headless',
1313
'freebsd': 'openjdk17-jre',
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
3+
#
4+
# install tap2junit from pip
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

jenkins/scripts/select-compiler.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ if [ "$NODEJS_MAJOR_VERSION" -ge "25" ]; then
4343
echo "Compiler set to Clang" `${CXX} -dumpversion`
4444
return
4545
;;
46-
*debian12*)
46+
*debian12*|*debian13*)
4747
echo "Using Clang for Node.js $NODEJS_MAJOR_VERSION"
4848
export CC="ccache clang-19"
4949
export CXX="ccache clang++-19"
@@ -65,6 +65,8 @@ if [ "$NODEJS_MAJOR_VERSION" -ge "25" ]; then
6565
return
6666
;;
6767
*ubuntu2404*)
68+
export CARGO=cargo-1.82
69+
export RUSTC=rustc-1.82
6870
echo "Using Clang for Node.js $NODEJS_MAJOR_VERSION"
6971
export CC="ccache clang-19"
7072
export CXX="ccache clang++-19"

0 commit comments

Comments
 (0)