Skip to content

Commit 5dfb090

Browse files
authored
refactor(ansible): delete .env files and update README references (#6962)
Signed-off-by: Mete Fatih Cırıt <mfc@autoware.org>
1 parent 8e0af37 commit 5dfb090

9 files changed

Lines changed: 18 additions & 69 deletions

File tree

.webauto-ci.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ artifacts:
4848
- .webauto-ci/main/autoware-setup/**/*
4949
- ansible/**/*
5050
- ansible-galaxy-requirements.yaml
51-
- amd64.env
5251
incremental_build:
5352
enabled: true
5453
- name: autoware-build

amd64.env

Lines changed: 0 additions & 13 deletions
This file was deleted.

amd64_jazzy.env

Lines changed: 0 additions & 13 deletions
This file was deleted.

ansible/roles/cuda/README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ Follow these instructions to download and install the CUDA Toolkit.
3535
From: <https://docs.nvidia.com/cuda/cuda-installation-guide-linux/index.html#network-repo-installation-for-ubuntu>
3636

3737
```bash
38-
wget -O /tmp/amd64.env https://raw.githubusercontent.com/autowarefoundation/autoware/main/amd64.env && source /tmp/amd64.env
38+
# From the Autoware repository root:
39+
cuda_version=$(sed -n 's/^cuda_version: *"\(.*\)"/\1/p' ansible/roles/cuda/defaults/main.yaml)
3940

4041
os=ubuntu2204
4142
arch_dir=$(

ansible/roles/dev_tools/README.md

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,9 @@ This role installs optional development tools for Autoware.
2121

2222
## Set up the environment variables
2323

24-
Choose **one** ROS distribution and run the corresponding command.
25-
26-
### ROS 2 Humble
27-
28-
```bash
29-
wget -O /tmp/amd64.env https://raw.githubusercontent.com/autowarefoundation/autoware/main/amd64.env && \
30-
source /tmp/amd64.env
31-
```
32-
33-
### ROS 2 Jazzy
34-
3524
```bash
36-
wget -O /tmp/amd64.env https://raw.githubusercontent.com/autowarefoundation/autoware/main/amd64_jazzy.env && \
37-
source /tmp/amd64.env
25+
# Choose your ROS distribution
26+
rosdistro=humble # or jazzy
3827
```
3928

4029
## Install the tools

ansible/roles/rmw_implementation/README.md

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,12 @@ This role sets up ROS 2 RMW implementation following [this page](https://docs.ro
1313

1414
## Set up the environment variables
1515

16-
Choose **one** ROS distribution and run the corresponding command.
17-
18-
### ROS 2 Humble
19-
2016
```bash
21-
wget -O /tmp/amd64.env https://raw.githubusercontent.com/autowarefoundation/autoware/main/amd64.env && \
22-
source /tmp/amd64.env
23-
```
17+
# Choose your ROS distribution
18+
rosdistro=humble # or jazzy
2419

25-
### ROS 2 Jazzy
26-
27-
```bash
28-
wget -O /tmp/amd64.env https://raw.githubusercontent.com/autowarefoundation/autoware/main/amd64_jazzy.env && \
29-
source /tmp/amd64.env
20+
# RMW implementation (see ./defaults/main.yaml for the current default)
21+
rmw_implementation=rmw_cyclonedds_cpp
3022
```
3123

3224
## Install the RMW implementation

ansible/roles/ros2/README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ For Universe, the `rosdistro` variable can also be found in:
3232
[../../playbooks/universe.yaml](../../playbooks/universe.yaml)
3333

3434
```bash
35-
wget -O /tmp/amd64.env https://raw.githubusercontent.com/autowarefoundation/autoware/main/amd64.env && source /tmp/amd64.env
35+
# Choose your ROS distribution
36+
rosdistro=humble # or jazzy
3637

3738
# Taken from: https://docs.ros.org/en/humble/Installation/Ubuntu-Install-Debians.html
3839

ansible/roles/tensorrt/README.md

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,15 @@ This role installs TensorRT following [the official NVIDIA TensorRT Installation
1212

1313
### Set up the environment variables
1414

15-
Choose **one** ROS distribution and run the corresponding command.
16-
17-
#### ROS 2 Humble
18-
19-
```bash
20-
wget -O /tmp/amd64.env https://raw.githubusercontent.com/autowarefoundation/autoware/main/amd64.env && \
21-
source /tmp/amd64.env
22-
```
23-
24-
#### ROS 2 Jazzy
25-
2615
```bash
27-
wget -O /tmp/amd64.env https://raw.githubusercontent.com/autowarefoundation/autoware/main/amd64_jazzy.env && \
28-
source /tmp/amd64.env
16+
# From the Autoware repository root:
17+
# defaults/main.yaml contains an architecture-dependent Jinja2 expression;
18+
# extract the matching version for this machine.
19+
if [ "$(uname -m)" = "aarch64" ]; then
20+
tensorrt_version=$(grep -oP "'\K[^']+(?=' if)" ansible/roles/tensorrt/defaults/main.yaml)
21+
else
22+
tensorrt_version=$(grep -oP "else '\K[^']+" ansible/roles/tensorrt/defaults/main.yaml)
23+
fi
2924
```
3025

3126
### Install TensorRT

arm64.env

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)