Skip to content

Commit de97406

Browse files
committed
refactor(ansible): rename internal playbooks to install_* prefix
Phase 1 internal rename pass for the ansible entrypoint consolidation tracked in #7052. These three playbooks are only referenced from Dockerfiles in this repo, so renaming them is a pure internal refactor with no external impact. - autoware_requirements.yaml -> install_image_deps.yaml (core.Dockerfile, universe.Dockerfile, universe-cuda.Dockerfile) - nvidia.yaml -> install_nvidia.yaml (base-cuda.Dockerfile; updates both bind-mount paths and playbook names) - rmw.yaml -> install_rmw.yaml (base.Dockerfile; updates bind-mount path and playbook name) Signed-off-by: Mete Fatih Cırıt <mfc@autoware.org>
1 parent 2440d27 commit de97406

8 files changed

Lines changed: 11 additions & 11 deletions

File tree

File renamed without changes.

docker/base-cuda.Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ RUN --mount=type=bind,source=ansible-galaxy-requirements.yaml,target=/tmp/ansibl
1212
--mount=type=bind,source=ansible/roles/cuda,target=/tmp/ansible/ansible/roles/cuda \
1313
--mount=type=bind,source=ansible/roles/tensorrt,target=/tmp/ansible/ansible/roles/tensorrt \
1414
--mount=type=bind,source=ansible/roles/spconv,target=/tmp/ansible/ansible/roles/spconv \
15-
--mount=type=bind,source=ansible/playbooks/nvidia.yaml,target=/tmp/ansible/ansible/playbooks/nvidia.yaml \
15+
--mount=type=bind,source=ansible/playbooks/install_nvidia.yaml,target=/tmp/ansible/ansible/playbooks/install_nvidia.yaml \
1616
--mount=type=cache,id=apt-cache-${ROS_DISTRO},target=/var/cache/apt,sharing=locked \
1717
--mount=type=cache,id=apt-lists-${ROS_DISTRO},target=/var/lib/apt/lists,sharing=locked \
1818
--mount=type=cache,id=pipx-cache,target=/home/aw/.cache/pipx,uid=1000,gid=1000 \
1919
pipx install --include-deps "ansible==10.*" && \
2020
cd /tmp/ansible && \
2121
ansible-galaxy collection install -f -r ansible-galaxy-requirements.yaml && \
22-
ansible-playbook autoware.dev_env.nvidia \
22+
ansible-playbook autoware.dev_env.install_nvidia \
2323
-e install_devel=N \
2424
-e cuda_install_drivers=false && \
2525
pipx uninstall ansible
@@ -38,14 +38,14 @@ RUN --mount=type=bind,source=ansible-galaxy-requirements.yaml,target=/tmp/ansibl
3838
--mount=type=bind,source=ansible/roles/cuda,target=/tmp/ansible/ansible/roles/cuda \
3939
--mount=type=bind,source=ansible/roles/tensorrt,target=/tmp/ansible/ansible/roles/tensorrt \
4040
--mount=type=bind,source=ansible/roles/spconv,target=/tmp/ansible/ansible/roles/spconv \
41-
--mount=type=bind,source=ansible/playbooks/nvidia.yaml,target=/tmp/ansible/ansible/playbooks/nvidia.yaml \
41+
--mount=type=bind,source=ansible/playbooks/install_nvidia.yaml,target=/tmp/ansible/ansible/playbooks/install_nvidia.yaml \
4242
--mount=type=cache,id=apt-cache-${ROS_DISTRO},target=/var/cache/apt,sharing=locked \
4343
--mount=type=cache,id=apt-lists-${ROS_DISTRO},target=/var/lib/apt/lists,sharing=locked \
4444
--mount=type=cache,id=pipx-cache,target=/home/aw/.cache/pipx,uid=1000,gid=1000 \
4545
pipx install --include-deps "ansible==10.*" && \
4646
cd /tmp/ansible && \
4747
ansible-galaxy collection install -f -r ansible-galaxy-requirements.yaml && \
48-
ansible-playbook autoware.dev_env.nvidia \
48+
ansible-playbook autoware.dev_env.install_nvidia \
4949
-e install_devel=y \
5050
-e cuda_install_drivers=false && \
5151
pipx uninstall ansible

docker/base.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,14 @@ ENV ANSIBLE_COLLECTIONS_PATH="/home/${USERNAME}/.ansible/collections"
5050
RUN --mount=type=bind,source=ansible-galaxy-requirements.yaml,target=/tmp/ansible/ansible-galaxy-requirements.yaml \
5151
--mount=type=bind,source=ansible/galaxy.yml,target=/tmp/ansible/ansible/galaxy.yml \
5252
--mount=type=bind,source=ansible/roles/rmw_implementation,target=/tmp/ansible/ansible/roles/rmw_implementation \
53-
--mount=type=bind,source=ansible/playbooks/rmw.yaml,target=/tmp/ansible/ansible/playbooks/rmw.yaml \
53+
--mount=type=bind,source=ansible/playbooks/install_rmw.yaml,target=/tmp/ansible/ansible/playbooks/install_rmw.yaml \
5454
--mount=type=cache,id=apt-cache-${ROS_DISTRO},target=/var/cache/apt,sharing=locked \
5555
--mount=type=cache,id=apt-lists-${ROS_DISTRO},target=/var/lib/apt/lists,sharing=locked \
5656
--mount=type=cache,id=pipx-cache,target=/home/aw/.cache/pipx,uid=1000,gid=1000 \
5757
pipx install --include-deps "ansible==10.*" && \
5858
cd /tmp/ansible && \
5959
ansible-galaxy collection install -f -r ansible-galaxy-requirements.yaml && \
60-
ansible-playbook autoware.dev_env.rmw \
60+
ansible-playbook autoware.dev_env.install_rmw \
6161
-e rosdistro=${ROS_DISTRO} && \
6262
pipx uninstall ansible
6363

docker/core.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ RUN --mount=type=bind,source=ansible-galaxy-requirements.yaml,target=/tmp/ansibl
1717
pipx install --include-deps "ansible==10.*" && \
1818
cd /tmp/ansible && \
1919
ansible-galaxy collection install -f -r ansible-galaxy-requirements.yaml && \
20-
ansible-playbook autoware.dev_env.autoware_requirements \
20+
ansible-playbook autoware.dev_env.install_image_deps \
2121
--tags core \
2222
--skip-tags base \
2323
-e "rosdistro=${ROS_DISTRO}" && \
@@ -105,7 +105,7 @@ RUN --mount=type=bind,source=ansible-galaxy-requirements.yaml,target=/tmp/ansibl
105105
pipx install --include-deps "ansible==10.*" && \
106106
cd /tmp/ansible && \
107107
ansible-galaxy collection install -f -r ansible-galaxy-requirements.yaml && \
108-
ansible-playbook autoware.dev_env.autoware_requirements \
108+
ansible-playbook autoware.dev_env.install_image_deps \
109109
--tags geographiclib,qt5ct_setup \
110110
-e "rosdistro=${ROS_DISTRO}" && \
111111
pipx uninstall ansible

docker/universe-cuda.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ RUN --mount=type=bind,source=ansible-galaxy-requirements.yaml,target=/tmp/ansibl
1818
pipx install --include-deps "ansible==10.*" && \
1919
cd /tmp/ansible && \
2020
ansible-galaxy collection install -f -r ansible-galaxy-requirements.yaml && \
21-
ansible-playbook autoware.dev_env.autoware_requirements \
21+
ansible-playbook autoware.dev_env.install_image_deps \
2222
--tags core,acados \
2323
--skip-tags base,nvidia \
2424
-e "rosdistro=${ROS_DISTRO}" && \
@@ -82,7 +82,7 @@ RUN --mount=type=bind,source=ansible-galaxy-requirements.yaml,target=/tmp/ansibl
8282
pipx install --include-deps "ansible==10.*" && \
8383
cd /tmp/ansible && \
8484
ansible-galaxy collection install -f -r ansible-galaxy-requirements.yaml && \
85-
ansible-playbook autoware.dev_env.autoware_requirements \
85+
ansible-playbook autoware.dev_env.install_image_deps \
8686
--tags geographiclib,qt5ct_setup \
8787
-e "rosdistro=${ROS_DISTRO}" && \
8888
pipx uninstall ansible

docker/universe.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ RUN --mount=type=cache,id=apt-cache-${ROS_DISTRO},target=/var/cache/apt,sharing=
1313
--mount=type=cache,id=pip-cache,target=/home/aw/.cache/pip,uid=1000,gid=1000 \
1414
--mount=type=cache,id=pipx-cache,target=/home/aw/.cache/pipx,uid=1000,gid=1000 \
1515
pipx install --include-deps "ansible==10.*" && \
16-
ansible-playbook autoware.dev_env.autoware_requirements \
16+
ansible-playbook autoware.dev_env.install_image_deps \
1717
--tags acados \
1818
-e "rosdistro=${ROS_DISTRO}" && \
1919
sudo rm -rf /opt/acados/.git /opt/acados/examples /opt/acados/docs /opt/acados/test && \

0 commit comments

Comments
 (0)