From 783be1762ff1ba83a89529f06f66818bd1f8f359 Mon Sep 17 00:00:00 2001
From: Yutaka Kondo <yutaka.kondo@youtalk.jp>
Date: Thu, 10 Oct 2024 11:41:12 +0900
Subject: [PATCH 1/8] fix(.github): change `runs-on` value from `ubuntu-latest`
 to `ubuntu-22.04` (#5320)

change to ubuntu-22.04

Signed-off-by: Yutaka Kondo <yutaka.kondo@youtalk.jp>
---
 .github/workflows/backport.yaml                              | 2 +-
 .github/workflows/cancel-previous-workflows.yaml             | 2 +-
 .github/workflows/create-prs-to-update-vcs-repositories.yaml | 2 +-
 .github/workflows/dco.yaml                                   | 2 +-
 .github/workflows/docker-build-and-push.yaml                 | 2 +-
 .github/workflows/github-release.yaml                        | 2 +-
 .github/workflows/health-check.yaml                          | 2 +-
 .github/workflows/load-env.yaml                              | 2 +-
 .github/workflows/mirror-main-branch.yaml                    | 2 +-
 .github/workflows/pre-commit-ansible-autoupdate.yaml         | 2 +-
 .github/workflows/pre-commit-ansible.yaml                    | 2 +-
 .github/workflows/pre-commit-autoupdate.yaml                 | 2 +-
 .github/workflows/pre-commit-optional-autoupdate.yaml        | 2 +-
 .github/workflows/pre-commit-optional.yaml                   | 2 +-
 .github/workflows/pre-commit.yaml                            | 2 +-
 .github/workflows/setup-docker.yaml                          | 2 +-
 .github/workflows/setup-universe.yaml                        | 2 +-
 .github/workflows/spell-check-differential.yaml              | 2 +-
 .github/workflows/sync-files.yaml                            | 2 +-
 .github/workflows/update-docker-manifest.yaml                | 2 +-
 .github/workflows/update-tool-versions.yaml                  | 2 +-
 21 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/backport.yaml b/.github/workflows/backport.yaml
index d79e7098883..53e4e96cfaa 100644
--- a/.github/workflows/backport.yaml
+++ b/.github/workflows/backport.yaml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   backport:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     # Only react to merged PRs for security reasons.
     # See https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request_target.
     if: >
diff --git a/.github/workflows/cancel-previous-workflows.yaml b/.github/workflows/cancel-previous-workflows.yaml
index 44983f7dead..bd2463d5a8e 100644
--- a/.github/workflows/cancel-previous-workflows.yaml
+++ b/.github/workflows/cancel-previous-workflows.yaml
@@ -5,7 +5,7 @@ on:
 
 jobs:
   cancel-previous-workflows:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Cancel previous runs
         uses: styfle/cancel-workflow-action@0.12.1
diff --git a/.github/workflows/create-prs-to-update-vcs-repositories.yaml b/.github/workflows/create-prs-to-update-vcs-repositories.yaml
index 8eca0a8fb9b..adb5628e28a 100644
--- a/.github/workflows/create-prs-to-update-vcs-repositories.yaml
+++ b/.github/workflows/create-prs-to-update-vcs-repositories.yaml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   create-version-update-pr:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
 
diff --git a/.github/workflows/dco.yaml b/.github/workflows/dco.yaml
index db7ace467c6..e95b394ac63 100644
--- a/.github/workflows/dco.yaml
+++ b/.github/workflows/dco.yaml
@@ -4,7 +4,7 @@ on:
   pull_request:
 jobs:
   dco:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
 
diff --git a/.github/workflows/docker-build-and-push.yaml b/.github/workflows/docker-build-and-push.yaml
index 025d6e7485c..a321bfe5ddc 100644
--- a/.github/workflows/docker-build-and-push.yaml
+++ b/.github/workflows/docker-build-and-push.yaml
@@ -13,7 +13,7 @@ jobs:
 
   docker-build-and-push:
     needs: load-env
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:
diff --git a/.github/workflows/github-release.yaml b/.github/workflows/github-release.yaml
index b426d0cba66..4b1d7f47c6c 100644
--- a/.github/workflows/github-release.yaml
+++ b/.github/workflows/github-release.yaml
@@ -15,7 +15,7 @@ on:
 
 jobs:
   github-release:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Set tag name
         id: set-tag-name
diff --git a/.github/workflows/health-check.yaml b/.github/workflows/health-check.yaml
index a312cb970ec..80163069c68 100644
--- a/.github/workflows/health-check.yaml
+++ b/.github/workflows/health-check.yaml
@@ -26,7 +26,7 @@ jobs:
 
   docker-build:
     needs: load-env
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:
diff --git a/.github/workflows/load-env.yaml b/.github/workflows/load-env.yaml
index e65389426b1..ff7f24b6887 100644
--- a/.github/workflows/load-env.yaml
+++ b/.github/workflows/load-env.yaml
@@ -10,7 +10,7 @@ on:
 
 jobs:
   load-env:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     outputs:
       base_image: ${{ steps.set-env.outputs.base_image }}
       rosdistro: ${{ steps.set-env.outputs.rosdistro }}
diff --git a/.github/workflows/mirror-main-branch.yaml b/.github/workflows/mirror-main-branch.yaml
index 504867e36ed..c85f67dbc0c 100644
--- a/.github/workflows/mirror-main-branch.yaml
+++ b/.github/workflows/mirror-main-branch.yaml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   mirror-main-branch:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: zofrex/mirror-branch@v1
         with:
diff --git a/.github/workflows/pre-commit-ansible-autoupdate.yaml b/.github/workflows/pre-commit-ansible-autoupdate.yaml
index 84bc42eada2..7e3226bfa31 100644
--- a/.github/workflows/pre-commit-ansible-autoupdate.yaml
+++ b/.github/workflows/pre-commit-ansible-autoupdate.yaml
@@ -14,7 +14,7 @@ jobs:
   pre-commit-ansible-autoupdate:
     needs: check-secret
     if: ${{ needs.check-secret.outputs.set == 'true' }}
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Generate token
         id: generate-token
diff --git a/.github/workflows/pre-commit-ansible.yaml b/.github/workflows/pre-commit-ansible.yaml
index dd023cbd265..4a01eb7fb4f 100644
--- a/.github/workflows/pre-commit-ansible.yaml
+++ b/.github/workflows/pre-commit-ansible.yaml
@@ -5,7 +5,7 @@ on:
 
 jobs:
   pre-commit-ansible:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Check out repository
         uses: actions/checkout@v4
diff --git a/.github/workflows/pre-commit-autoupdate.yaml b/.github/workflows/pre-commit-autoupdate.yaml
index 23b403f2a52..8d57a53b5cc 100644
--- a/.github/workflows/pre-commit-autoupdate.yaml
+++ b/.github/workflows/pre-commit-autoupdate.yaml
@@ -14,7 +14,7 @@ jobs:
   pre-commit-autoupdate:
     needs: check-secret
     if: ${{ needs.check-secret.outputs.set == 'true' }}
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Generate token
         id: generate-token
diff --git a/.github/workflows/pre-commit-optional-autoupdate.yaml b/.github/workflows/pre-commit-optional-autoupdate.yaml
index 72718377c75..a9fe00401a1 100644
--- a/.github/workflows/pre-commit-optional-autoupdate.yaml
+++ b/.github/workflows/pre-commit-optional-autoupdate.yaml
@@ -14,7 +14,7 @@ jobs:
   pre-commit-optional-autoupdate:
     needs: check-secret
     if: ${{ needs.check-secret.outputs.set == 'true' }}
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Generate token
         id: generate-token
diff --git a/.github/workflows/pre-commit-optional.yaml b/.github/workflows/pre-commit-optional.yaml
index 38738196a0b..12f536c5516 100644
--- a/.github/workflows/pre-commit-optional.yaml
+++ b/.github/workflows/pre-commit-optional.yaml
@@ -5,7 +5,7 @@ on:
 
 jobs:
   pre-commit-optional:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Check out repository
         uses: actions/checkout@v4
diff --git a/.github/workflows/pre-commit.yaml b/.github/workflows/pre-commit.yaml
index c724885fcb3..4d005e849b5 100644
--- a/.github/workflows/pre-commit.yaml
+++ b/.github/workflows/pre-commit.yaml
@@ -6,7 +6,7 @@ on:
 jobs:
   pre-commit:
     if: ${{ github.event.repository.private }} # Use pre-commit.ci for public repositories
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Generate token
         id: generate-token
diff --git a/.github/workflows/setup-docker.yaml b/.github/workflows/setup-docker.yaml
index caca7bcc9ce..c28b9f7ca32 100644
--- a/.github/workflows/setup-docker.yaml
+++ b/.github/workflows/setup-docker.yaml
@@ -5,7 +5,7 @@ on:
 
 jobs:
   setup-docker:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Check out repository
         uses: actions/checkout@v4
diff --git a/.github/workflows/setup-universe.yaml b/.github/workflows/setup-universe.yaml
index ef39011aca8..8f4d16d50e8 100644
--- a/.github/workflows/setup-universe.yaml
+++ b/.github/workflows/setup-universe.yaml
@@ -5,7 +5,7 @@ on:
 
 jobs:
   setup-universe:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Check out repository
         uses: actions/checkout@v4
diff --git a/.github/workflows/spell-check-differential.yaml b/.github/workflows/spell-check-differential.yaml
index 1fbf2ff4692..f030a45251d 100644
--- a/.github/workflows/spell-check-differential.yaml
+++ b/.github/workflows/spell-check-differential.yaml
@@ -5,7 +5,7 @@ on:
 
 jobs:
   spell-check-differential:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Check out repository
         uses: actions/checkout@v4
diff --git a/.github/workflows/sync-files.yaml b/.github/workflows/sync-files.yaml
index 51e523b8031..0cffbcd2a26 100644
--- a/.github/workflows/sync-files.yaml
+++ b/.github/workflows/sync-files.yaml
@@ -14,7 +14,7 @@ jobs:
   sync-files:
     needs: check-secret
     if: ${{ needs.check-secret.outputs.set == 'true' }}
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Generate token
         id: generate-token
diff --git a/.github/workflows/update-docker-manifest.yaml b/.github/workflows/update-docker-manifest.yaml
index af9324fb162..d37c187acfb 100644
--- a/.github/workflows/update-docker-manifest.yaml
+++ b/.github/workflows/update-docker-manifest.yaml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   update-docker-manifest:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Check out repository
         uses: actions/checkout@v4
diff --git a/.github/workflows/update-tool-versions.yaml b/.github/workflows/update-tool-versions.yaml
index 9ec312d7ca7..2f38b8a2213 100644
--- a/.github/workflows/update-tool-versions.yaml
+++ b/.github/workflows/update-tool-versions.yaml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   update-tool-versions:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Generate token
         id: generate-token

From 2669af58d4e98da76ae46ecebd5c3785fef9eee9 Mon Sep 17 00:00:00 2001
From: Samrat Thapa <38401989+SamratThapa120@users.noreply.github.com>
Date: Thu, 10 Oct 2024 13:43:52 +0900
Subject: [PATCH 2/8] chore(autoware_lidar_transfusion): updated transfusion
 models (#5318)

updated transfusion models

Signed-off-by: Samrat Thapa <samratthapa120@gmail.com>
Co-authored-by: Yutaka Kondo <yutaka.kondo@youtalk.jp>
---
 ansible/roles/artifacts/tasks/main.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ansible/roles/artifacts/tasks/main.yaml b/ansible/roles/artifacts/tasks/main.yaml
index c46bf3aed2f..02825a0d041 100644
--- a/ansible/roles/artifacts/tasks/main.yaml
+++ b/ansible/roles/artifacts/tasks/main.yaml
@@ -169,15 +169,15 @@
 - name: Download lidar_transfusion/transfusion.onnx
   become: true
   ansible.builtin.get_url:
-    url: https://awf.ml.dev.web.auto/perception/models/transfusion/t4xx1_90m/v2/transfusion.onnx
+    url: https://awf.ml.dev.web.auto/perception/models/transfusion/t4xx1_90m/v2.1/transfusion.onnx
     dest: "{{ data_dir }}/lidar_transfusion/transfusion.onnx"
     mode: "644"
-    checksum: sha256:ad66a061d61449af671bd0d14c2c407f0d749753f17f3165287857f686c4fd1a
+    checksum: sha256:1d8f0ee6d59ccc3cca914f9892f6ac8f0a9e35082abb91da183c00e3e2c2718a
 
 - name: Download lidar_transfusion/transfusion_ml_package.param.yaml
   become: true
   ansible.builtin.get_url:
-    url: https://awf.ml.dev.web.auto/perception/models/transfusion/t4xx1_90m/v2/transfusion_ml_package.param.yaml
+    url: https://awf.ml.dev.web.auto/perception/models/transfusion/t4xx1_90m/v2.1/transfusion_ml_package.param.yaml
     dest: "{{ data_dir }}/lidar_transfusion/transfusion_ml_package.param.yaml"
     mode: "644"
     checksum: sha256:476f7727adc17a823962f2e09ba23d40f3116c50be48361d98179d054cd131b6
@@ -185,7 +185,7 @@
 - name: Download lidar_transfusion/detection_class_remapper.param.yaml
   become: true
   ansible.builtin.get_url:
-    url: https://awf.ml.dev.web.auto/perception/models/transfusion/t4xx1_90m/v2/detection_class_remapper.param.yaml
+    url: https://awf.ml.dev.web.auto/perception/models/transfusion/t4xx1_90m/v2.1/detection_class_remapper.param.yaml
     dest: "{{ data_dir }}/lidar_transfusion/detection_class_remapper.param.yaml"
     mode: "644"
     checksum: sha256:c711f8875ece9b527dfe31ffc75f8c0de2e77945ef67860a959a4e04c36772d5

From 24d3d7fa3189b3813a965b4e05777c277be556bf Mon Sep 17 00:00:00 2001
From: Yutaka Kondo <yutaka.kondo@youtalk.jp>
Date: Thu, 10 Oct 2024 17:16:15 +0900
Subject: [PATCH 3/8] fix(.github): fix non `-cuda` tag names for
 `universe-vehicle-system` (#5319)

* fix universe-vehicle-system tags

Signed-off-by: Yutaka Kondo <yutaka.kondo@youtalk.jp>

* change to ubuntu-22.04

Signed-off-by: Yutaka Kondo <yutaka.kondo@youtalk.jp>

---------

Signed-off-by: Yutaka Kondo <yutaka.kondo@youtalk.jp>
---
 .github/actions/docker-build-and-push/action.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/actions/docker-build-and-push/action.yaml b/.github/actions/docker-build-and-push/action.yaml
index b7e6b393b1e..728d52b9376 100644
--- a/.github/actions/docker-build-and-push/action.yaml
+++ b/.github/actions/docker-build-and-push/action.yaml
@@ -174,8 +174,8 @@ runs:
       with:
         images: ghcr.io/${{ github.repository_owner }}/${{ inputs.bake-target }}
         tags: |
-          type=raw,value=universe-vehicle-system-devel${{ inputs.tag-suffix && '-' }}${{ inputs.tag-suffix }}
-          type=raw,value=universe-vehicle-system-devel${{ inputs.tag-suffix && '-' }}${{ inputs.tag-suffix }}-${{ steps.date.outputs.date }}
+          type=raw,value=universe-vehicle-system-devel${{ inputs.tag-suffix }}-${{ inputs.platform }}
+          type=raw,value=universe-vehicle-system-devel${{ inputs.tag-suffix }}-${{ steps.date.outputs.date }}-${{ inputs.platform }}
         bake-target: docker-metadata-action-universe-vehicle-system-devel
         flavor: |
           latest=false
@@ -186,8 +186,8 @@ runs:
       with:
         images: ghcr.io/${{ github.repository_owner }}/${{ inputs.bake-target }}
         tags: |
-          type=raw,value=universe-vehicle-system${{ inputs.tag-suffix && '-' }}${{ inputs.tag-suffix }}
-          type=raw,value=universe-vehicle-system${{ inputs.tag-suffix && '-' }}${{ inputs.tag-suffix }}-${{ steps.date.outputs.date }}
+          type=raw,value=universe-vehicle-system${{ inputs.tag-suffix }}-${{ inputs.platform }}
+          type=raw,value=universe-vehicle-system${{ inputs.tag-suffix }}-${{ steps.date.outputs.date }}-${{ inputs.platform }}
         bake-target: docker-metadata-action-universe-vehicle-system
         flavor: |
           latest=false

From ac59d90d15c9e085d8e7a7b63ffba128d8ff0a5a Mon Sep 17 00:00:00 2001
From: Yutaka Kondo <yutaka.kondo@youtalk.jp>
Date: Fri, 11 Oct 2024 19:59:27 +0900
Subject: [PATCH 4/8] fix(docker): install CUDA development drivers in
 development containers (#5332)

---
 ansible/playbooks/openadkit.yaml | 8 ++++----
 docker/Dockerfile                | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ansible/playbooks/openadkit.yaml b/ansible/playbooks/openadkit.yaml
index 5cfa0408d58..dc02ee99ef5 100644
--- a/ansible/playbooks/openadkit.yaml
+++ b/ansible/playbooks/openadkit.yaml
@@ -26,16 +26,16 @@
       when: module == 'base'
     - role: autoware.dev_env.pacmod
       when: module == 'base'
-    - role: autoware.dev_env.cuda
-      when: module == 'base' and prompt_install_nvidia=='y'
-    - role: autoware.dev_env.tensorrt
-      when: module == 'base' and prompt_install_nvidia=='y'
     - role: autoware.dev_env.build_tools
       when: module == 'all' and install_devel=='y'
 
     # Module specific dependencies
     - role: autoware.dev_env.geographiclib
       when: module == 'perception-localization' or module == 'all'
+    - role: autoware.dev_env.cuda
+      when: (module == 'base' or module == 'perception-localization' or module == 'all') and prompt_install_nvidia=='y'
+    - role: autoware.dev_env.tensorrt
+      when: (module == 'base' or module == 'perception-localization' or module == 'all') and prompt_install_nvidia=='y'
 
     # Development environment
     - role: autoware.dev_env.dev_tools
diff --git a/docker/Dockerfile b/docker/Dockerfile
index efde0797845..82e2ccaf9e0 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -193,12 +193,13 @@ RUN rosdep keys --dependency-types=exec --ignore-src --from-paths src \
 FROM base AS core-devel
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 ARG ROS_DISTRO
+ARG SETUP_ARGS
 ENV CCACHE_DIR="/root/.ccache"
 
 # Set up development environment and tools
 RUN --mount=type=ssh \
   --mount=type=cache,target=/var/cache/apt,sharing=locked \
-  ./setup-dev-env.sh -y --module all openadkit \
+  ./setup-dev-env.sh -y --module all ${SETUP_ARGS} --no-cuda-drivers openadkit \
   && ./setup-dev-env.sh -y --module dev-tools openadkit \
   && pip uninstall -y ansible ansible-core \
   && apt-get autoremove -y && rm -rf "$HOME"/.cache

From 2ab4f1cfaaf4027f748cd5d36edfd2eb7e0156a9 Mon Sep 17 00:00:00 2001
From: Yutaka Kondo <yutaka.kondo@youtalk.jp>
Date: Tue, 15 Oct 2024 06:31:44 +0900
Subject: [PATCH 5/8] chore(docker): remove `/autoware/log` after `colcon
 build` (#5329)

---
 docker/Dockerfile | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 82e2ccaf9e0..eda2e415942 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -223,7 +223,7 @@ RUN --mount=type=cache,target=${CCACHE_DIR} \
     --install-base /opt/autoware \
     --mixin release compile-commands ccache \
   && du -sh ${CCACHE_DIR} && ccache -s \
-  && rm -rf /autoware/build
+  && rm -rf /autoware/build /autoware/log
 
 ENTRYPOINT ["/ros_entrypoint.sh"]
 CMD ["/bin/bash"]
@@ -255,7 +255,7 @@ RUN --mount=type=cache,target=${CCACHE_DIR} \
     --install-base /opt/autoware \
     --mixin release compile-commands ccache \
   && du -sh ${CCACHE_DIR} && ccache -s \
-  && rm -rf /autoware/build
+  && rm -rf /autoware/build /autoware/log
 
 ENTRYPOINT ["/ros_entrypoint.sh"]
 CMD ["/bin/bash"]
@@ -287,7 +287,7 @@ RUN --mount=type=cache,target=${CCACHE_DIR} \
     --install-base /opt/autoware \
     --mixin release compile-commands ccache \
   && du -sh ${CCACHE_DIR} && ccache -s \
-  && rm -rf /autoware/build
+  && rm -rf /autoware/build /autoware/log
 
 ENTRYPOINT ["/ros_entrypoint.sh"]
 CMD ["/bin/bash"]
@@ -319,7 +319,7 @@ RUN --mount=type=cache,target=${CCACHE_DIR} \
     --install-base /opt/autoware \
     --mixin release compile-commands ccache \
   && du -sh ${CCACHE_DIR} && ccache -s \
-  && rm -rf /autoware/build
+  && rm -rf /autoware/build /autoware/log
 
 FROM universe-common-devel AS universe-planning-control-devel
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
@@ -353,7 +353,7 @@ RUN --mount=type=cache,target=${CCACHE_DIR} \
     --install-base /opt/autoware \
     --mixin release compile-commands ccache \
   && du -sh ${CCACHE_DIR} && ccache -s \
-  && rm -rf /autoware/build
+  && rm -rf /autoware/build /autoware/log
 
 ENTRYPOINT ["/ros_entrypoint.sh"]
 CMD ["/bin/bash"]
@@ -387,7 +387,7 @@ RUN --mount=type=cache,target=${CCACHE_DIR} \
     --install-base /opt/autoware \
     --mixin release compile-commands ccache \
   && du -sh ${CCACHE_DIR} && ccache -s \
-  && rm -rf /autoware/build
+  && rm -rf /autoware/build /autoware/log
 
 ENTRYPOINT ["/ros_entrypoint.sh"]
 CMD ["/bin/bash"]
@@ -430,7 +430,7 @@ RUN --mount=type=cache,target=${CCACHE_DIR} \
     --install-base /opt/autoware \
     --mixin release compile-commands ccache \
   && du -sh ${CCACHE_DIR} && ccache -s \
-  && rm -rf /autoware/build
+  && rm -rf /autoware/build /autoware/log
 
 ENTRYPOINT ["/ros_entrypoint.sh"]
 CMD ["/bin/bash"]

From 71d2f316818576987c2015971ab72731c470fb13 Mon Sep 17 00:00:00 2001
From: Yutaka Kondo <yutaka.kondo@youtalk.jp>
Date: Mon, 21 Oct 2024 18:27:02 +0900
Subject: [PATCH 6/8] chore(.github): always run `Show disk space` (#5354)

always show disk space

Signed-off-by: Yutaka Kondo <yutaka.kondo@youtalk.jp>
---
 .github/workflows/docker-build-and-push-arm64.yaml | 1 +
 .github/workflows/docker-build-and-push.yaml       | 1 +
 .github/workflows/health-check-arm64.yaml          | 1 +
 .github/workflows/health-check.yaml                | 1 +
 4 files changed, 4 insertions(+)

diff --git a/.github/workflows/docker-build-and-push-arm64.yaml b/.github/workflows/docker-build-and-push-arm64.yaml
index c262f0944a1..75a51b48581 100644
--- a/.github/workflows/docker-build-and-push-arm64.yaml
+++ b/.github/workflows/docker-build-and-push-arm64.yaml
@@ -83,5 +83,6 @@ jobs:
           tag-suffix: ${{ matrix.tag-suffix }}
 
       - name: Show disk space
+        if: always()
         run: |
           df -h
diff --git a/.github/workflows/docker-build-and-push.yaml b/.github/workflows/docker-build-and-push.yaml
index a321bfe5ddc..d81db3f4a19 100644
--- a/.github/workflows/docker-build-and-push.yaml
+++ b/.github/workflows/docker-build-and-push.yaml
@@ -78,5 +78,6 @@ jobs:
           tag-suffix: ${{ matrix.tag-suffix }}
 
       - name: Show disk space
+        if: always()
         run: |
           df -h
diff --git a/.github/workflows/health-check-arm64.yaml b/.github/workflows/health-check-arm64.yaml
index baf58b00d3b..eca18a45bd3 100644
--- a/.github/workflows/health-check-arm64.yaml
+++ b/.github/workflows/health-check-arm64.yaml
@@ -58,5 +58,6 @@ jobs:
             LIB_DIR=${{ matrix.lib_dir }}
 
       - name: Show disk space
+        if: always()
         run: |
           df -h
diff --git a/.github/workflows/health-check.yaml b/.github/workflows/health-check.yaml
index 80163069c68..9a54be6cb77 100644
--- a/.github/workflows/health-check.yaml
+++ b/.github/workflows/health-check.yaml
@@ -68,5 +68,6 @@ jobs:
             LIB_DIR=${{ matrix.lib_dir }}
 
       - name: Show disk space
+        if: always()
         run: |
           df -h

From 99dd3de66c8d50bc8445cafbdd0f72e0bb63b0c5 Mon Sep 17 00:00:00 2001
From: chgyg <99009754+ChgygLin@users.noreply.github.com>
Date: Wed, 23 Oct 2024 19:53:44 +0800
Subject: [PATCH 7/8] build(autoware.repos): remove ament_cmake fork repository
 (#5360)

Signed-off-by: Chengyong Lin <stclin@qq.com>
---
 autoware.repos | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/autoware.repos b/autoware.repos
index bd3b94c0240..68d623199ee 100644
--- a/autoware.repos
+++ b/autoware.repos
@@ -75,10 +75,6 @@ repositories:
     type: git
     url: https://github.com/MapIV/llh_converter.git
     version: ros2
-  universe/external/ament_cmake: # TODO(mitsudome-r): remove when https://github.com/ament/ament_cmake/pull/448 is merged
-    type: git
-    url: https://github.com/autowarefoundation/ament_cmake.git
-    version: feat/faster_ament_libraries_deduplicate
   universe/external/glog:  # TODO(Horibe): to use isGoogleInitialized() API in v0.6.0. Remove when the rosdep glog version is updated to v0.6.0 (already updated in Ubuntu 24.04)
     type: git
     url: https://github.com/tier4/glog.git

From 477e9063b2446b42fb9f8732d64bd7ef8e421b36 Mon Sep 17 00:00:00 2001
From: mitsudome-r <ryohsuke.mitsudome@tier4.jp>
Date: Fri, 13 Dec 2024 16:49:45 +0900
Subject: [PATCH 8/8] chore: fix repos files for 2024.11

Signed-off-by: mitsudome-r <ryohsuke.mitsudome@tier4.jp>
---
 autoware.repos  | 81 +++++++++++++++++++++----------------------------
 simulator.repos |  2 +-
 tools.repos     |  2 +-
 3 files changed, 37 insertions(+), 48 deletions(-)

diff --git a/autoware.repos b/autoware.repos
index 68d623199ee..c5d0e6ffceb 100644
--- a/autoware.repos
+++ b/autoware.repos
@@ -1,52 +1,48 @@
 repositories:
-  # core
   core/autoware_msgs:
     type: git
     url: https://github.com/autowarefoundation/autoware_msgs.git
-    version: 1.2.0
+    version: 4f9f1c0a8adeed63986d00d3f7ce7f4453c95789
   core/autoware_adapi_msgs:
     type: git
     url: https://github.com/autowarefoundation/autoware_adapi_msgs.git
-    version: 1.3.0
+    version: 2512a4f6d5d27deede62f32d859006be35ca7ef6
   core/autoware_internal_msgs:
     type: git
     url: https://github.com/autowarefoundation/autoware_internal_msgs.git
-    version: 1.1.0
-  # TODO(youtalk): Remove autoware_common when https://github.com/autowarefoundation/autoware/issues/4911 is closed
+    version: 4f5feff509b52d6de802c87b79e44636f8c88a25
   core/autoware_common:
     type: git
     url: https://github.com/autowarefoundation/autoware_common.git
-    version: remove-autoware-cmake-utils
+    version: 6752ca71a985c3bd39ab9cc23a3695930f0a6e29
   core/autoware_cmake:
     type: git
     url: https://github.com/autowarefoundation/autoware_cmake.git
-    version: 1.0.0
+    version: 890e31281d293b87933b1ad3c1d2846c88d77ffa
   core/autoware_utils:
     type: git
     url: https://github.com/autowarefoundation/autoware_utils.git
-    version: 1.0.0
+    version: 451419ec58923b1a1035956f838afdb8d3cbc0d3
   core/autoware_lanelet2_extension:
     type: git
     url: https://github.com/autowarefoundation/autoware_lanelet2_extension.git
-    version: 0.6.1
+    version: 6fc35a09cd147192e5d7905d4a8455988e3302ca
   core/autoware.core:
     type: git
     url: https://github.com/autowarefoundation/autoware.core.git
-    version: main
-  # universe
+    version: a06b4533475f84e62d673273175ff4a62da907cf
   universe/autoware.universe:
     type: git
     url: https://github.com/autowarefoundation/autoware.universe.git
-    version: main
-  universe/external/tier4_ad_api_adaptor: # TODO(TIER IV): Migrate to AD API
+    version: 4ba9dd4c8076901a90616881df2c8c3712c122f3
+  universe/external/tier4_ad_api_adaptor:
     type: git
     url: https://github.com/tier4/tier4_ad_api_adaptor.git
-    version: tier4/universe
+    version: 3de19bc5b554d4cecef2240da3c33434379ccb54
   universe/external/tier4_autoware_msgs:
     type: git
     url: https://github.com/tier4/tier4_autoware_msgs.git
-    version: tier4/universe
-  # Fix the version not to merge https://github.com/MORAI-Autonomous/MORAI-ROS2_morai_msgs/pull/9
+    version: a6d8211121615793fb8fdbe3a04a4acea33a09bb
   universe/external/morai_msgs:
     type: git
     url: https://github.com/MORAI-Autonomous/MORAI-ROS2_morai_msgs.git
@@ -54,91 +50,84 @@ repositories:
   universe/external/muSSP:
     type: git
     url: https://github.com/tier4/muSSP.git
-    version: tier4/main
+    version: c79e98fd5e658f4f90c06d93472faa977bc873b9
   universe/external/ndt_omp:
     type: git
     url: https://github.com/tier4/ndt_omp.git
-    version: tier4/main
+    version: 2c8b6ef38a93f5eddc9ead1350eeba652ea31933
   universe/external/pointcloud_to_laserscan:
     type: git
     url: https://github.com/tier4/pointcloud_to_laserscan.git
-    version: tier4/main
+    version: d969ec699f84fad827fbadfa3001c9c657482fbe
   universe/external/eagleye:
     type: git
     url: https://github.com/MapIV/eagleye.git
-    version: autoware-main
+    version: c1919448336e86a8dd9c94a337032c05fcf6c381
   universe/external/rtklib_ros_bridge:
     type: git
     url: https://github.com/MapIV/rtklib_ros_bridge.git
-    version: ros2-v0.1.0
+    version: ef094407bba4f475a8032972e0c60cbb939b51b8
   universe/external/llh_converter:
     type: git
     url: https://github.com/MapIV/llh_converter.git
-    version: ros2
-  universe/external/glog:  # TODO(Horibe): to use isGoogleInitialized() API in v0.6.0. Remove when the rosdep glog version is updated to v0.6.0 (already updated in Ubuntu 24.04)
+    version: 07ad112b4f6b83eccd3a5f777bbe40ff01c67382
+  universe/external/glog:
     type: git
     url: https://github.com/tier4/glog.git
-    version: v0.6.0_t4-ros
-  # launcher
+    version: ea36766fdc2ac8e8c8e3ac988ae69acd6d09bb30
   launcher/autoware_launch:
     type: git
     url: https://github.com/autowarefoundation/autoware_launch.git
-    version: main
-  # sensor_component
+    version: 05b42b48f70bff478e52575c7f4e9134d5d7736b
   sensor_component/external/sensor_component_description:
     type: git
     url: https://github.com/tier4/sensor_component_description.git
-    version: main
+    version: 079820003a1c969df7fa02ca092e532c66ab809e
   sensor_component/external/tamagawa_imu_driver:
     type: git
     url: https://github.com/tier4/tamagawa_imu_driver.git
-    version: ros2
+    version: de4bf6be79aa2968cf2f62e0ebe1ff8a5797e6ad
   sensor_component/external/nebula:
     type: git
     url: https://github.com/tier4/nebula.git
-    version: v0.2.1
-  # Fork of transport_drivers that enables reduction of copy operations
+    version: f43a28d1a8a51aca5efcae9186139767154bc44f
   sensor_component/transport_drivers:
     type: git
     url: https://github.com/autowarefoundation/transport_drivers
-    version: main
-  # Continental compatible version of ROS 2 socket CAN
+    version: 39ebd8afe1bb9760a6cd6272e428468480f6de90
   sensor_component/ros2_socketcan:
     type: git
     url: https://github.com/autowarefoundation/ros2_socketcan
-    version: main
-  # sensor_kit
+    version: 85da8c31286cad69de65dc50219e7d901ae9e94b
   sensor_kit/sample_sensor_kit_launch:
     type: git
     url: https://github.com/autowarefoundation/sample_sensor_kit_launch.git
-    version: main
-  sensor_kit/external/awsim_sensor_kit_launch: # TODO: Integrate into sample_sensor_kit_launch
+    version: c6b1ee5a26320e53a12455c83b98c63e0e9e1ab7
+  sensor_kit/external/awsim_sensor_kit_launch:
     type: git
     url: https://github.com/RobotecAI/awsim_sensor_kit_launch.git
-    version: main
+    version: 931930c3dc511750994f34d8d4824c8ea4bd1767
   sensor_kit/awsim_labs_sensor_kit_launch:
     type: git
     url: https://github.com/autowarefoundation/awsim_labs_sensor_kit_launch.git
-    version: main
+    version: d531d0b5b32672534536b1f49ec0bf4283ad2388
   sensor_kit/single_lidar_sensor_kit_launch:
     type: git
     url: https://github.com/autowarefoundation/single_lidar_sensor_kit_launch.git
-    version: main
-  # vehicle
+    version: ce550a82e220c36cf6af8aa9356d0da274968e35
   vehicle/sample_vehicle_launch:
     type: git
     url: https://github.com/autowarefoundation/sample_vehicle_launch.git
-    version: main
+    version: 292d6d90eddd41e32217f34519e4b99fed009dec
   vehicle/awsim_labs_vehicle_launch:
     type: git
     url: https://github.com/autowarefoundation/awsim_labs_vehicle_launch.git
-    version: main
+    version: a7d1e7a64c3f7e4b27b49ea247ec6b82e713166f
   vehicle/external/pacmod_interface:
     type: git
     url: https://github.com/tier4/pacmod_interface.git
-    version: main
-  # param
+    version: 6efb5d13e1843d11e4eed5f00fbda4ba71f20481
   param/autoware_individual_params:
     type: git
     url: https://github.com/autowarefoundation/autoware_individual_params.git
-    version: main
+    version: 70000825155182d9261ce0980076b0e2c6dc3f51
\ No newline at end of file
diff --git a/simulator.repos b/simulator.repos
index 30e005c4f0c..6737d0ad469 100644
--- a/simulator.repos
+++ b/simulator.repos
@@ -2,4 +2,4 @@ repositories:
   simulator/scenario_simulator:
     type: git
     url: https://github.com/tier4/scenario_simulator_v2.git
-    version: RJD-736/autoware_msgs_support  # TODO(mitsudome-r): switch back to master once this branch is merged
+    version: 9f308a09b43e9352fd78090d9112e7580f923a8e
diff --git a/tools.repos b/tools.repos
index f2d1a47d9fa..6bff0353610 100644
--- a/tools.repos
+++ b/tools.repos
@@ -2,4 +2,4 @@ repositories:
   tools:
     type: git
     url: https://github.com/autowarefoundation/autoware_tools.git
-    version: main
+    version: fd20d8b9cb7291518f6f9c6b52fe160951a20317