From 4e2870297af351fb2f3857f4714dee5a21c3c81e Mon Sep 17 00:00:00 2001
From: oguzkaganozt <oguz@leodrive.ai>
Date: Wed, 31 Jan 2024 15:38:24 +0300
Subject: [PATCH] Update playbook and roles for downloading artifacts

---
 ansible/playbooks/openadk.yaml                 | 2 +-
 ansible/roles/geographiclib/defaults/main.yaml | 1 -
 ansible/roles/geographiclib/tasks/main.yaml    | 2 +-
 ansible/roles/nvidia_docker/tasks/main.yaml    | 6 +++---
 docker/autoware-openadk/Dockerfile             | 6 +++---
 setup-dev-env.sh                               | 7 ++++++-
 6 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/ansible/playbooks/openadk.yaml b/ansible/playbooks/openadk.yaml
index b0f821c8323..bdb52e31c11 100644
--- a/ansible/playbooks/openadk.yaml
+++ b/ansible/playbooks/openadk.yaml
@@ -43,4 +43,4 @@
 
     # ONNX files and other artifacts
     - role: autoware.dev_env.artifacts
-      when: module == 'dev-tools' or (module == 'all' and install_devel == 'false')
+      when: prompt_download_artifacts == 'y'
diff --git a/ansible/roles/geographiclib/defaults/main.yaml b/ansible/roles/geographiclib/defaults/main.yaml
index f2b553a52f4..e69de29bb2d 100644
--- a/ansible/roles/geographiclib/defaults/main.yaml
+++ b/ansible/roles/geographiclib/defaults/main.yaml
@@ -1 +0,0 @@
-module: dev-tools
diff --git a/ansible/roles/geographiclib/tasks/main.yaml b/ansible/roles/geographiclib/tasks/main.yaml
index 29f13855b14..c0c2a153eea 100644
--- a/ansible/roles/geographiclib/tasks/main.yaml
+++ b/ansible/roles/geographiclib/tasks/main.yaml
@@ -10,4 +10,4 @@
   ansible.builtin.command:
     cmd: geographiclib-get-geoids egm2008-1
     creates: /usr/share/GeographicLib/geoids/egm2008-1.pgm
-  when: module == 'dev-tools' or install_devel== 'false'
+  when: prompt_download_artifacts == 'y'
diff --git a/ansible/roles/nvidia_docker/tasks/main.yaml b/ansible/roles/nvidia_docker/tasks/main.yaml
index b9d521df441..93864adb491 100644
--- a/ansible/roles/nvidia_docker/tasks/main.yaml
+++ b/ansible/roles/nvidia_docker/tasks/main.yaml
@@ -8,10 +8,10 @@
 - name: Add NVIDIA container toolkit repository
   become: true
   ansible.builtin.apt_repository:
-    repo: "deb [signed-by=/usr/share/keyrings/nvidia-container-toolkit-keyring.gpg] https://nvidia.github.io/libnvidia-container/stable/deb/ {{ ansible_distribution_release }} {{ ansible_architecture }}"
+    repo: deb [signed-by=/usr/share/keyrings/nvidia-container-toolkit-keyring.gpg] https://nvidia.github.io/libnvidia-container/stable/deb/nvidia-container-toolkit.list
     state: present
-    filename: nvidia-container-toolkit
-    update_cache: yes
+    filename: nvidia-container-toolkit.list
+    update_cache: true
 
 - name: Install NVIDIA Container Toolkit
   become: true
diff --git a/docker/autoware-openadk/Dockerfile b/docker/autoware-openadk/Dockerfile
index 5af80b6fdd3..ac1cb2c6eb2 100644
--- a/docker/autoware-openadk/Dockerfile
+++ b/docker/autoware-openadk/Dockerfile
@@ -84,7 +84,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
 # Install development tools and artifacts
 RUN --mount=type=ssh \
-  ./setup-dev-env.sh -y --module dev-tools openadk \
+  ./setup-dev-env.sh -y --module dev-tools --download-artifacts openadk \
   && pip uninstall -y ansible ansible-core \
   && apt-get autoremove -y && apt-get clean -y && rm -rf /var/lib/apt/lists/* "$HOME"/.cache
 
@@ -108,10 +108,10 @@ ARG ROS_DISTRO
 ARG LIB_DIR
 ARG SETUP_ARGS
 
-# Set up runtime environment
+# Set up runtime environment and artifacts
 COPY autoware.repos /autoware/
 RUN --mount=type=ssh \
-  ./setup-dev-env.sh -y --module all ${SETUP_ARGS} --no-cuda-drivers --runtime openadk \
+  ./setup-dev-env.sh -y --module all ${SETUP_ARGS} --download-artifacts --no-cuda-drivers --runtime openadk \
   && pip uninstall -y ansible ansible-core \
   && mkdir src \
   && vcs import src < autoware.repos \
diff --git a/setup-dev-env.sh b/setup-dev-env.sh
index 0050d9c13fd..16bf71c9752 100755
--- a/setup-dev-env.sh
+++ b/setup-dev-env.sh
@@ -115,7 +115,12 @@ else
 fi
 
 # Check downloading artifacts
-if [ "$option_yes" = "true" ] || [ "$option_download_artifacts" = "true" ]; then
+if [ "$target_playbook" = "autoware.dev_env.openadk" ]; then
+    if [ "$option_download_artifacts" = "true" ]; then
+        echo -e "\e[36mArtifacts will be downloaded to $option_data_dir\e[m"
+        ansible_args+=("--extra-vars" "prompt_download_artifacts=y")
+    fi
+elif [ "$option_yes" = "true" ] || [ "$option_download_artifacts" = "true" ]; then
     echo -e "\e[36mArtifacts will be downloaded to $option_data_dir\e[m"
     ansible_args+=("--extra-vars" "prompt_download_artifacts=y")
 fi