From f77cfdbc13e29189241e1bb1d56bf5f5e40a294f Mon Sep 17 00:00:00 2001 From: Kenji Miyake <31987104+kenji-miyake@users.noreply.github.com> Date: Thu, 1 Dec 2022 22:10:31 +0900 Subject: [PATCH] build(ROS distribution)!: transition to ROS 2 Humble (#480) * chore: add missing packages into repos Signed-off-by: wep21 * chore: update grid map branch Signed-off-by: wep21 * chore: update ublox branch Signed-off-by: wep21 * remove diagnostics from repos Signed-off-by: wep21 * remove quaternion operations Signed-off-by: Daisuke Nishimatsu * remove plotjuggler from repos Co-authored-by: Kenji Miyake <31987104+kenji-miyake@users.noreply.github.com> * remove plotjuggler_ros from repos Co-authored-by: Kenji Miyake <31987104+kenji-miyake@users.noreply.github.com> * remove velodyne simulator Co-authored-by: Kenji Miyake <31987104+kenji-miyake@users.noreply.github.com> * change Ansible branch Signed-off-by: Kenji Miyake * update env files Signed-off-by: Kenji Miyake * chore(repos): remove autonomoustuff packages from repos Signed-off-by: Daisuke Nishimatsu * update container version of setup-local-dev-env.yaml Signed-off-by: Kenji Miyake * add ros/diagnostics Signed-off-by: Kenji Miyake * chore(repos): remove navigation2 Signed-off-by: Daisuke Nishimatsu * update vcs-import Signed-off-by: Kenji Miyake * remove old CI workflow Signed-off-by: Kenji Miyake * WIP: update calibration_tools.repos Signed-off-by: Kenji Miyake * use upstream for grid map Signed-off-by: Daisuke Nishimatsu * ci: update .webauto-ci.yml (#493) * chore: remove some packages (#566) chore: remove released packages Signed-off-by: Daisuke Nishimatsu Signed-off-by: Daisuke Nishimatsu Signed-off-by: wep21 Signed-off-by: Daisuke Nishimatsu Signed-off-by: Kenji Miyake Co-authored-by: wep21 Co-authored-by: Daisuke Nishimatsu <42202095+wep21@users.noreply.github.com> Co-authored-by: Makoto Tokunaga --- .github/workflows/check-missing-packages.yaml | 34 ------------------- .webauto-ci.yml | 9 ++++- amd64.env | 6 ++-- ansible-galaxy-requirements.yaml | 2 +- autoware.repos | 11 +----- calibration_tools.repos | 2 +- 6 files changed, 14 insertions(+), 50 deletions(-) delete mode 100644 .github/workflows/check-missing-packages.yaml diff --git a/.github/workflows/check-missing-packages.yaml b/.github/workflows/check-missing-packages.yaml deleted file mode 100644 index 2a9b297dfb65e..0000000000000 --- a/.github/workflows/check-missing-packages.yaml +++ /dev/null @@ -1,34 +0,0 @@ -name: check-missing-packages - -on: - schedule: - - cron: 0 0 * * 0 - workflow_dispatch: - -jobs: - check-missing-packages: - runs-on: ubuntu-latest - container: ros:${{ matrix.ros_distribution }} - strategy: - fail-fast: false - matrix: - include: - - { ros_distribution: galactic, package: __dummy__ } - steps: - - name: Check ros-${{ matrix.ros_distribution }}-${{ matrix.package }} - id: check-package - run: | - sudo apt-get -y update - result=$(apt-cache search ros-${{ matrix.ros_distribution }}-${{ matrix.package }}) - echo "::set-output name=result::$result" - - - name: Install ros-${{ matrix.ros_distribution }}-${{ matrix.package }} - if: ${{ jobs.check-package.outputs.result != '' }} - run: | - sudo apt-get -y install ros-${{ matrix.ros_distribution }}-${{ matrix.package }} - - - name: Notify by raising an error - if: ${{ jobs.check-package.outputs.result != '' }} - run: | - echo "ros-${{ matrix.ros_distribution }}-${{ matrix.package }} can be installed." - exit 1 diff --git a/.webauto-ci.yml b/.webauto-ci.yml index 079dd7a098b89..bc8753af73b9b 100644 --- a/.webauto-ci.yml +++ b/.webauto-ci.yml @@ -7,7 +7,7 @@ version: 2 artifacts: - name: main build: - type: tier4/iv/main/amd64/v2 + type: tier4/universe/main/amd64/v1 simulations: - name: planning_sim_v2 @@ -38,3 +38,10 @@ simulations: type: simulator/standard1/amd64/medium cpu: 8 memory: 16384 + +release: + components: + - name: autoware + deployment: + type: rootfs + artifact: main diff --git a/amd64.env b/amd64.env index dad15c2106b42..1366bd83c917a 100644 --- a/amd64.env +++ b/amd64.env @@ -1,7 +1,7 @@ -rosdistro=galactic +rosdistro=humble rmw_implementation=rmw_cyclonedds_cpp -base_image=ubuntu:20.04 -cuda_base_image=nvidia/cuda:11.6.2-devel-ubuntu20.04 +base_image=ubuntu:22.04 +cuda_base_image=ubuntu:22.04 cuda_version=11.6 cudnn_version=8.4.1.50-1+cuda11.6 tensorrt_version=8.4.2-1+cuda11.6 diff --git a/ansible-galaxy-requirements.yaml b/ansible-galaxy-requirements.yaml index ccb1587e281fb..5ce33c9ff2c2b 100644 --- a/ansible-galaxy-requirements.yaml +++ b/ansible-galaxy-requirements.yaml @@ -4,4 +4,4 @@ collections: - name: https://github.com/autowarefoundation/autoware.git#/ansible type: git - version: b5b46f0415ef01366aa636e67b265f07f93f71f4 + version: 9e35fd1c6f8bb16c166f6408b41f6280ee1356f2 diff --git a/autoware.repos b/autoware.repos index 933d9a3fd8a38..d30da1f1abb2c 100644 --- a/autoware.repos +++ b/autoware.repos @@ -59,11 +59,6 @@ repositories: url: git@github.com:tier4/autoware_ecu_system_setup.git version: main # vendor - # After https://github.com/ANYbotics/grid_map/pull/323 is merged, use upstream. - vendor/grid_map: - type: git - url: https://github.com/tier4/grid_map.git - version: 657cc055eb90a042057738a85a5651c03e42b1bb vendor/pacmod_interface: type: git url: https://github.com/tier4/pacmod_interface.git @@ -79,7 +74,7 @@ repositories: vendor/ublox: type: git url: https://github.com/tier4/ublox.git - version: ba21bbbad702e99074f706a7b868db79968e1dfd + version: tier4/rolling vendor/lidar-driver: type: git url: git@github.com:tier4/lidar_driver.git @@ -104,10 +99,6 @@ repositories: type: git url: https://github.com/tier4/ars408_driver.git version: main - vendor/diagnostics: - type: git - url: https://github.com/tier4/diagnostics.git - version: da6cdbe674dd7bf1e71ee6fb73825e3e43644f0c vendor/spinnaker: type: git url: https://github.com/tier4/spinnaker.git diff --git a/calibration_tools.repos b/calibration_tools.repos index 5846824bfaceb..1be805e8a8cd0 100644 --- a/calibration_tools.repos +++ b/calibration_tools.repos @@ -6,7 +6,7 @@ repositories: vendor/lidartag: type: git url: git@github.com:tier4/LiDARTag.git - version: galactic + version: humble vendor/lidartag_msgs: type: git url: git@github.com:tier4/LiDARTag_msgs.git