From 39d98b1972d87d0a2a8fa5e8380fe368243d2fe2 Mon Sep 17 00:00:00 2001 From: ykataya-fsi Date: Tue, 6 Aug 2024 13:23:01 +0900 Subject: [PATCH 01/14] Update .webauto-ci.yaml --- .webauto-ci.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.webauto-ci.yaml b/.webauto-ci.yaml index 74a23b71d4e..cc67a4e1c6e 100644 --- a/.webauto-ci.yaml +++ b/.webauto-ci.yaml @@ -24,6 +24,14 @@ simulations: vehicle_model: sample_vehicle sensor_model: sample_sensor_kit initialize_duration: "90" + - name: localization + type: localization + simulator: + deployment: + type: container + artifact: main + runtime: + type: standard1/amd64/large release: components: From b878e936156c4e3b2b5f41fafc1a652b98b5e871 Mon Sep 17 00:00:00 2001 From: ykataya-fsi Date: Tue, 6 Aug 2024 13:27:29 +0900 Subject: [PATCH 02/14] Update simulator.repos --- simulator.repos | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/simulator.repos b/simulator.repos index 30e005c4f0c..bbc36adce37 100644 --- a/simulator.repos +++ b/simulator.repos @@ -1,4 +1,21 @@ repositories: + simulator/driving_log_replayer: + type: git + url: https://github.com/tier4/driving_log_replayer.git + version: main + simulator/perception_eval: + type: git + url: https://github.com/tier4/autoware_perception_evaluation.git + version: main + simulator/vendor/ros2_numpy: + type: git + url: https://github.com/Box-Robotics/ros2_numpy.git + version: humble + simulator/vendor/operational-design-domains: + type: git + url: +https://gitlab.com/autowarefoundation/operational-design-domains + version: 42321f9a04fcaef9caf3694530e1c63d3e27c47a simulator/scenario_simulator: type: git url: https://github.com/tier4/scenario_simulator_v2.git From 4ce329a28c8e74f8b98c250ac41ecdd5f3b181aa Mon Sep 17 00:00:00 2001 From: ykataya-fsi Date: Tue, 6 Aug 2024 14:02:18 +0900 Subject: [PATCH 03/14] Update simulator.repos --- simulator.repos | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/simulator.repos b/simulator.repos index bbc36adce37..eabe3d6dfbe 100644 --- a/simulator.repos +++ b/simulator.repos @@ -13,8 +13,7 @@ repositories: version: humble simulator/vendor/operational-design-domains: type: git - url: -https://gitlab.com/autowarefoundation/operational-design-domains + url: https://gitlab.com/autowarefoundation/operational-design-domains version: 42321f9a04fcaef9caf3694530e1c63d3e27c47a simulator/scenario_simulator: type: git From f1202104c5bf616e5cf11f47d8d3e5c2718cfa45 Mon Sep 17 00:00:00 2001 From: ykataya-fsi Date: Tue, 6 Aug 2024 14:15:25 +0900 Subject: [PATCH 04/14] Update simulator.repos --- simulator.repos | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/simulator.repos b/simulator.repos index eabe3d6dfbe..e55b4783cd7 100644 --- a/simulator.repos +++ b/simulator.repos @@ -1,21 +1,21 @@ repositories: simulator/driving_log_replayer: - type: git - url: https://github.com/tier4/driving_log_replayer.git - version: main + type: git + url: https://github.com/tier4/driving_log_replayer.git + version: main simulator/perception_eval: - type: git - url: https://github.com/tier4/autoware_perception_evaluation.git - version: main + type: git + url: https://github.com/tier4/autoware_perception_evaluation.git + version: main simulator/vendor/ros2_numpy: - type: git - url: https://github.com/Box-Robotics/ros2_numpy.git - version: humble + type: git + url: https://github.com/Box-Robotics/ros2_numpy.git + version: humble simulator/vendor/operational-design-domains: - type: git - url: https://gitlab.com/autowarefoundation/operational-design-domains - version: 42321f9a04fcaef9caf3694530e1c63d3e27c47a - 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 + type: git + url: https://gitlab.com/autowarefoundation/operational-design-domains + version: 42321f9a04fcaef9caf3694530e1c63d3e27c47a + 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 From ee90f43fda829eb3269fc298c800ffcaf7a99461 Mon Sep 17 00:00:00 2001 From: ykataya-fsi Date: Mon, 19 Aug 2024 15:32:15 +0900 Subject: [PATCH 05/14] Update .webauto-ci.yaml --- .webauto-ci.yaml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.webauto-ci.yaml b/.webauto-ci.yaml index cc67a4e1c6e..4cb450d9157 100644 --- a/.webauto-ci.yaml +++ b/.webauto-ci.yaml @@ -6,6 +6,24 @@ artifacts: type: tier4/universe/main/amd64/v1 simulations: + - name: perception + type: perception + simulator: + deployment: + type: container + artifact: main + runtime: + type: gpu1/amd64/large + pre_tasks: + - exec: source /home/autoware/autoware.proj/install/setup.bash && ros2 launch lidar_centerpointlidar_centerpoint.launch.xml model_name:=centerpoint_tiny +model_path:=/home/autoware/autoware_data/lidar_centerpoint model_param_path:=$(ros2 pkg prefixlidar_centerpoint --share)/config/centerpoint_tiny.param.yaml build_only:=true + mounts: + - volume: model + volumes: + - name: model + path: /home/autoware/autoware_data/lidar_centerpoint + preserve_original_files: true + - name: lexus_planning_sim type: planning_sim_v2 simulator: From 977e6b4395982c62f08956460d86147b2ec753d7 Mon Sep 17 00:00:00 2001 From: ykataya-fsi Date: Mon, 19 Aug 2024 16:11:14 +0900 Subject: [PATCH 06/14] Update .webauto-ci.yaml --- .webauto-ci.yaml | 103 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 102 insertions(+), 1 deletion(-) diff --git a/.webauto-ci.yaml b/.webauto-ci.yaml index 4cb450d9157..4d3e03b8ba4 100644 --- a/.webauto-ci.yaml +++ b/.webauto-ci.yaml @@ -2,8 +2,109 @@ version: 2 artifacts: - name: main + metadata: + play-ondemand.ci.web.auto/buildspec: Autoware-Humble_v0.29.0 build: - type: tier4/universe/main/amd64/v1 + type: custom + runtime: + type: standard1/amd64/large + source: + vcstool: + repositories_files: + - autoware.repos + - simulator.repos + - tools.repos + import_path: src + environment_variables: + AUTOWARE_PATH: /home/autoware/pilot-auto + ML_MODELS_PATH: /opt/autoware/mlmodels + DEBIAN_FRONTEND: noninteractive + LANG: C.UTF-8 + developer_options: + - name: webauto:ci:caret_enabled + environment_variables: + WEBAUTO_CI_BUILD_OPTION_CARET_ENABLED: ENABLED + linux_parameters: + kernel_version: 5.15.0-72-generic + phases: + - name: environment-setup + user: root + exec: ./.webauto-ci/main/environment-setup/run.sh + caches: + - name: apt-lists + mountpoint: /var/lib/apt/lists + - name: apt-archives + mountpoint: /var/cache/apt/archives + build_result_reuse: + key_files: + - .webauto-ci/main/environment-setup/**/* + - name: autoware-setup + user: autoware + exec: ./.webauto-ci/main/autoware-setup/run.sh + caches: + - name: apt-lists + mountpoint: /var/lib/apt/lists + - name: apt-archives + mountpoint: /var/cache/apt/archives + build_result_reuse: + key_files: + - .webauto-ci/main/autoware-setup/**/* + - ansible/**/* + - ansible-galaxy-requirements.yaml + - amd64.env + incremental_build: + enabled: true + - name: autoware-build + user: autoware + exec: ./.webauto-ci/main/autoware-build/run.sh + environment_variables: + PARALLEL_WORKERS: "32" + CCACHE_DIR: /tmp/build/cache/ccache + caches: + - name: apt-lists + mountpoint: /var/lib/apt/lists + - name: apt-archives + mountpoint: /var/cache/apt/archives + - name: ccache + mountpoint: /tmp/build/cache/ccache + build_result_reuse: + key_files: + - .webauto-ci/main/autoware-build/**/* + - src/**/* + - "!src/ecu_system_setup/**" + incremental_build: + enabled: true + - name: ecu-system-setup + user: autoware + exec: ./.webauto-ci/main/ecu-system-setup/run.sh + environment_variables: + ECU_SYSTEM_SETUP_SOURCE_PATH: ansible + ECU_SYSTEM_SETUP_ANSIBLE_PLAYBOOK: ansible/playbooks/ecu_setup.yaml + caches: + - name: apt-lists + mountpoint: /var/lib/apt/lists + - name: apt-archives + mountpoint: /var/cache/apt/archives + build_result_reuse: + key_files: + - .webauto-ci/main/ecu-system-setup/**/* + - src/ecu_system_setup/**/* + - ansible/**/* + - ansible-galaxy-requirements.yaml + base_container_image: + from: ubuntu:22.04 + # from: ghcr.io/tier4/pilot-auto/base-image:latest # use base image + output_container_image: + from: autoware-build + workdir: /home/autoware/pilot-auto + user: autoware + output_rootfs_image: + from: ecu-system-setup + persistent_file_path: /home/autoware/pilot-auto/.webauto-ci/main/ecu-system-setup/persistents.txt + output_installer_image: + from: ecu-system-setup + type: iso + base_iso: ubuntu-20.04.3-live-server-amd64 simulations: - name: perception From dc12dedce2a3a80dd70f7053f354a42bfbb8ff4e Mon Sep 17 00:00:00 2001 From: Your Name Date: Mon, 19 Aug 2024 16:10:13 +0900 Subject: [PATCH 07/14] Add .webauto-ci/main/*/run.sh and .webauto-ci/main/ecu-system-setup/persistents --- .webauto-ci/main/asset-deploy/run.sh | 16 +++ .webauto-ci/main/autoware-build/run.sh | 134 ++++++++++++++++++ .webauto-ci/main/autoware-setup/run.sh | 32 +++++ .../main/ecu-system-setup/persistents.txt | 17 +++ .webauto-ci/main/ecu-system-setup/run.sh | 40 ++++++ .webauto-ci/main/environment-setup/run.sh | 14 ++ 6 files changed, 253 insertions(+) create mode 100755 .webauto-ci/main/asset-deploy/run.sh create mode 100755 .webauto-ci/main/autoware-build/run.sh create mode 100755 .webauto-ci/main/autoware-setup/run.sh create mode 100755 .webauto-ci/main/ecu-system-setup/persistents.txt create mode 100755 .webauto-ci/main/ecu-system-setup/run.sh create mode 100755 .webauto-ci/main/environment-setup/run.sh diff --git a/.webauto-ci/main/asset-deploy/run.sh b/.webauto-ci/main/asset-deploy/run.sh new file mode 100755 index 00000000000..f2b0a098796 --- /dev/null +++ b/.webauto-ci/main/asset-deploy/run.sh @@ -0,0 +1,16 @@ +#!/bin/bash -e + +: "${WEBAUTO_CI_ML_PACKAGES_PATH:=}" + +: "${ML_MODELS_PATH:=}" + +if [ -n "$WEBAUTO_CI_ML_PACKAGES_PATH" ] && [ -n "$ML_MODELS_PATH" ]; then + sudo mkdir -p "$(dirname "$ML_MODELS_PATH")" + sudo chown "$(whoami):" "$(dirname "$ML_MODELS_PATH")" + cp -r "$WEBAUTO_CI_ML_PACKAGES_PATH" "$ML_MODELS_PATH" + find "$ML_MODELS_PATH" -type d -exec chmod 777 {} \; + find "$ML_MODELS_PATH" -type f -exec chmod 644 {} \; + + echo "The following ML models have been deployed:" + ls "$ML_MODELS_PATH" +fi diff --git a/.webauto-ci/main/autoware-build/run.sh b/.webauto-ci/main/autoware-build/run.sh new file mode 100755 index 00000000000..6c38c9e56f7 --- /dev/null +++ b/.webauto-ci/main/autoware-build/run.sh @@ -0,0 +1,134 @@ +#!/bin/bash -e + +: "${WEBAUTO_CI_SOURCE_PATH:?is not set}" +: "${WEBAUTO_CI_DEBUG_BUILD:?is not set}" + +: "${AUTOWARE_PATH:?is not set}" +: "${CCACHE_DIR:=}" +: "${CCACHE_SIZE:=1G}" +: "${PARALLEL_WORKERS:=4}" + +# get installed ros distro +# shellcheck disable=SC2012 +ROS_DISTRO=$(ls -1 /opt/ros | head -1) + +# CARET build +if [ "$WEBAUTO_CI_BUILD_OPTION_CARET_ENABLED" = "ENABLED" ]; then + echo "CARET ENABLED" + + cd "$HOME" + rm -rf ros2_caret_ws + + # download CARET + echo "===== GET CARET =====" + CARET_VERSION="rc/v0.5.2_for_evaluator" + export GITHUB_TOKEN="$WEBAUTO_CI_GITHUB_TOKEN" + git clone https://github.com/tier4/caret.git ros2_caret_ws + cd ros2_caret_ws + git checkout "$CARET_VERSION" + + # setup CARET + echo "===== Setup CARET =====" + mkdir src + vcs import src $src/"'$(dirname {})'"/.rsync-include" +# shellcheck disable=SC2016 +find "$src" -name '.gitignore' -printf '%P\0' | xargs -0 -I {} sh -c "sed -n "'/^[^!]/p'" $src/{} > $src/"'$(dirname {})'"/.rsync-exclude" +rsync -rlpc -f":+ .rsync-include" -f":- .rsync-exclude" --del "$src"/ "$AUTOWARE_PATH" +# The `src` directory is excluded from the root .gitignore and must be synchronized separately. +rsync -rlpc -f":+ .rsync-include" -f":- .rsync-exclude" --del "$src"/src/ "$AUTOWARE_PATH"/src +# `.rsync-include` and `.rsync-exclude` must be included in the output of this phase for reference in the next incremental build. +# These files are removed in the ecu-system-setup phase. +#find "$AUTOWARE_PATH" \( -name ".rsync-include" -or -name ".rsync-exclude" \) -print0 | xargs -0 rm +rm -rf "$src" + +chmod 755 "$AUTOWARE_PATH" +cd "$AUTOWARE_PATH" + +if [ -n "$CCACHE_DIR" ]; then + mkdir -p "$CCACHE_DIR" + export USE_CCACHE=1 + export CCACHE_DIR="$CCACHE_DIR" + export CC="/usr/lib/ccache/gcc" + export CXX="/usr/lib/ccache/g++" + ccache -M "$CCACHE_SIZE" +fi + +sudo -E apt-get -y update + +# shellcheck disable=SC1090 +source "/opt/ros/${ROS_DISTRO}/setup.bash" +rosdep update +rosdep install -y --from-paths src --ignore-src --rosdistro "$ROS_DISTRO" + +# CARET setup +ADDITIONAL_OPTIONS="" +if [ "$WEBAUTO_CI_BUILD_OPTION_CARET_ENABLED" = "ENABLED" ]; then + echo "===== Modify ament_cmake_auto as workaround =====" + backup_date="$(date +"%Y%m%d_%H%M%S")" + cd /opt/ros/humble/share/ament_cmake_auto/cmake && + sudo cp ament_auto_add_executable.cmake ament_auto_add_executable.cmake_"$backup_date" && + sudo cp ament_auto_add_library.cmake ament_auto_add_library.cmake_"$backup_date" && + sudo sed -i -e 's/SYSTEM//g' ament_auto_add_executable.cmake && + sudo sed -i -e 's/SYSTEM//g' ament_auto_add_library.cmake + + # cspell: ignore libtracetools + echo "===== Modify pcl_ros (libtracetools.so) as workaround =====" + cd /opt/ros/humble/share/pcl_ros/cmake && + sudo cp export_pcl_rosExport.cmake export_pcl_rosExport.cmake_"$backup_date" && + sudo sed -i -e 's/\/opt\/ros\/humble\/lib\/libtracetools.so;//g' export_pcl_rosExport.cmake + + echo "===== Modify pcl_ros (rclcpp) as workaround =====" + cd /opt/ros/humble/share/pcl_ros/cmake && + sudo cp export_pcl_rosExport.cmake export_pcl_rosExport.cmake_"$backup_date"_2 && + sudo sed -i -e 's/\/opt\/ros\/humble\/include\/rclcpp;//g' export_pcl_rosExport.cmake + + cd "$AUTOWARE_PATH" + rm -f caret_topic_filter.bash + wget https://raw.githubusercontent.com/tier4/caret_report/main/sample_autoware/caret_topic_filter.bash + + # shellcheck disable=SC1090 + source "/opt/ros/${ROS_DISTRO}/setup.bash" + # shellcheck disable=SC1091 + source "$HOME/ros2_caret_ws/install/local_setup.sh" + echo "===== Finish CARET SETUP =====" + + ADDITIONAL_OPTIONS="--packages-skip rclcpp rclcpp_action rclcpp_components rclcpp_lifecycle" +fi +cd "$AUTOWARE_PATH" + +[[ $WEBAUTO_CI_DEBUG_BUILD == "true" ]] && build_type="RelWithDebInfo" || build_type="Release" + +# shellcheck disable=SC2086 +colcon build \ + --symlink-install \ + --cmake-args -DCMAKE_BUILD_TYPE="$build_type" -DCMAKE_CXX_FLAGS="-w" -DBUILD_TESTING=off \ + --catkin-skip-building-tests \ + --executor parallel \ + --parallel-workers "$PARALLEL_WORKERS" \ + $ADDITIONAL_OPTIONS + +if [ "$WEBAUTO_CI_BUILD_OPTION_CARET_ENABLED" = "ENABLED" ]; then + echo "===== Check CARET SETUP =====" + # shellcheck disable=SC1090,SC1091,SC2015 + source "/opt/ros/${ROS_DISTRO}/setup.sh" && + source "$HOME/ros2_caret_ws/install/local_setup.sh" && + ros2 caret check_caret_rclcpp ./ || + (echo "CARET build is failed" && exit 1) +fi diff --git a/.webauto-ci/main/autoware-setup/run.sh b/.webauto-ci/main/autoware-setup/run.sh new file mode 100755 index 00000000000..114e21c6f4e --- /dev/null +++ b/.webauto-ci/main/autoware-setup/run.sh @@ -0,0 +1,32 @@ +#!/bin/bash -e + +: "${WEBAUTO_CI_GITHUB_TOKEN:?is not set}" + +sudo curl -sSL https://raw.githubusercontent.com/ros/rosdistro/master/ros.key -o /usr/share/keyrings/ros-archive-keyring.gpg +echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/ros-archive-keyring.gpg] http://packages.ros.org/ros2/ubuntu $(source /etc/os-release && echo "$UBUNTU_CODENAME") main" | sudo tee /etc/apt/sources.list.d/ros2.list >/dev/null +sudo -E apt-get -y update +sudo -E apt-get -y install usbutils # For kvaser + +export GITHUB_TOKEN="$WEBAUTO_CI_GITHUB_TOKEN" +git config --global --add url."https://${GITHUB_TOKEN}:x-oauth-basic@github.com/".insteadOf "https://github.com/" +git config --global --add url."https://${GITHUB_TOKEN}:x-oauth-basic@github.com/".insteadOf "git@github.com:" + +ansible_args=() +ansible_args+=("--extra-vars" "prompt_install_nvidia=y") +ansible_args+=("--extra-vars" "prompt_download_artifacts=y") +ansible_args+=("--extra-vars" "data_dir=$HOME/autoware_data") + +# read amd64 env file and expand ansible arguments +source 'amd64.env' +while read -r env_name; do + ansible_args+=("--extra-vars" "${env_name}=${!env_name}") +done < <(sed "s/=.*//" >/etc/sudoers +gpasswd -a "$user" sudo From 92bedeb49f129d72e45a0a7a52deb5987baff788 Mon Sep 17 00:00:00 2001 From: Your Name Date: Mon, 19 Aug 2024 16:13:29 +0900 Subject: [PATCH 08/14] Add ansible/playbooks/local_dev_env.yaml --- ansible/playbooks/local_dev_env.yaml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 ansible/playbooks/local_dev_env.yaml diff --git a/ansible/playbooks/local_dev_env.yaml b/ansible/playbooks/local_dev_env.yaml new file mode 100644 index 00000000000..6a7df835bae --- /dev/null +++ b/ansible/playbooks/local_dev_env.yaml @@ -0,0 +1,4 @@ +- ansible.builtin.import_playbook: autoware.dev_env.universe +- hosts: localhost +connection: local +roles: From 61e94ad08b6b4a5bfc2d923db1d2a8f7909df5f6 Mon Sep 17 00:00:00 2001 From: Your Name Date: Thu, 17 Oct 2024 15:12:14 +0900 Subject: [PATCH 09/14] Add ansible/playbooks/local_dev_env.yaml --- ansible/playbooks/local_dev_env.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/playbooks/local_dev_env.yaml b/ansible/playbooks/local_dev_env.yaml index 6a7df835bae..558d8d27e5d 100644 --- a/ansible/playbooks/local_dev_env.yaml +++ b/ansible/playbooks/local_dev_env.yaml @@ -1,4 +1,4 @@ - ansible.builtin.import_playbook: autoware.dev_env.universe - hosts: localhost -connection: local -roles: + connection: local + roles: From cf078a3347e50a69c7af9fc997e724b772cf7307 Mon Sep 17 00:00:00 2001 From: ykataya-fsi Date: Thu, 17 Oct 2024 15:39:34 +0900 Subject: [PATCH 10/14] Update .webauto-ci.yaml --- .webauto-ci.yaml | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/.webauto-ci.yaml b/.webauto-ci.yaml index 4d3e03b8ba4..a35bbda1746 100644 --- a/.webauto-ci.yaml +++ b/.webauto-ci.yaml @@ -107,23 +107,22 @@ artifacts: base_iso: ubuntu-20.04.3-live-server-amd64 simulations: - - name: perception - type: perception - simulator: - deployment: - type: container - artifact: main - runtime: - type: gpu1/amd64/large - pre_tasks: - - exec: source /home/autoware/autoware.proj/install/setup.bash && ros2 launch lidar_centerpointlidar_centerpoint.launch.xml model_name:=centerpoint_tiny -model_path:=/home/autoware/autoware_data/lidar_centerpoint model_param_path:=$(ros2 pkg prefixlidar_centerpoint --share)/config/centerpoint_tiny.param.yaml build_only:=true + - name: perception + type: perception + simulator: + deployment: + type: container + artifact: main + runtime: + type: gpu1/amd64/large + pre_tasks: + - exec: source /home/autoware/autoware.proj/install/setup.bash && ros2 launch lidar_centerpointlidar_centerpoint.launch.xml model_name:=centerpoint_tiny model_path:=/home/autoware/autoware_data/lidar_centerpoint model_param_path:=$(ros2 pkg prefixlidar_centerpoint --share)/config/centerpoint_tiny.param.yaml build_only:=true mounts: - - volume: model - volumes: - - name: model - path: /home/autoware/autoware_data/lidar_centerpoint - preserve_original_files: true + - volume: model + volumes: + - name: model + path: /home/autoware/autoware_data/lidar_centerpoint + preserve_original_files: true - name: lexus_planning_sim type: planning_sim_v2 @@ -143,14 +142,15 @@ model_path:=/home/autoware/autoware_data/lidar_centerpoint model_param_path:=$(r vehicle_model: sample_vehicle sensor_model: sample_sensor_kit initialize_duration: "90" + - name: localization type: localization simulator: - deployment: - type: container - artifact: main - runtime: - type: standard1/amd64/large + deployment: + type: container + artifact: main + runtime: + type: standard1/amd64/large release: components: From 9ede9c963615fef53dadd68eb13655a7056c9359 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 21 Oct 2024 02:20:40 +0000 Subject: [PATCH 11/14] style(pre-commit): autofix --- .webauto-ci/main/autoware-setup/run.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/.webauto-ci/main/autoware-setup/run.sh b/.webauto-ci/main/autoware-setup/run.sh index 057a9244762..b4a3aa07d95 100755 --- a/.webauto-ci/main/autoware-setup/run.sh +++ b/.webauto-ci/main/autoware-setup/run.sh @@ -1,4 +1,3 @@ - : "${WEBAUTO_CI_GITHUB_TOKEN:?is not set}" sudo curl -sSL https://raw.githubusercontent.com/ros/rosdistro/master/ros.key -o /usr/share/keyrings/ros-archive-keyring.gpg From cfe2f619208f5011afd48e9b536a67b7f6b536dd Mon Sep 17 00:00:00 2001 From: ykataya-fsi Date: Mon, 21 Oct 2024 11:45:47 +0900 Subject: [PATCH 12/14] Update run.sh --- .webauto-ci/main/autoware-setup/run.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/.webauto-ci/main/autoware-setup/run.sh b/.webauto-ci/main/autoware-setup/run.sh index b4a3aa07d95..c743743dec4 100755 --- a/.webauto-ci/main/autoware-setup/run.sh +++ b/.webauto-ci/main/autoware-setup/run.sh @@ -13,8 +13,6 @@ ansible_args=() ansible_args+=("--extra-vars" "prompt_install_nvidia=y") ansible_args+=("--extra-vars" "prompt_download_artifacts=y") ansible_args+=("--extra-vars" "data_dir=$HOME/autoware_data") -ansible_args+=("--extra-vars" "ros2_installation_type=ros-base") -ansible_args+=("--extra-vars" "install_devel=false") # read amd64 env file and expand ansible arguments source 'amd64.env' From d2d2419674c4bc0e64aaf4763a017000b24e266c Mon Sep 17 00:00:00 2001 From: ykataya-fsi Date: Mon, 21 Oct 2024 12:00:38 +0900 Subject: [PATCH 13/14] Update run.sh --- .webauto-ci/main/autoware-setup/run.sh | 29 ++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/.webauto-ci/main/autoware-setup/run.sh b/.webauto-ci/main/autoware-setup/run.sh index c743743dec4..03ac5ed4bc9 100755 --- a/.webauto-ci/main/autoware-setup/run.sh +++ b/.webauto-ci/main/autoware-setup/run.sh @@ -1,3 +1,32 @@ +#!/bin/bash -e +: "${WEBAUTO_CI_GITHUB_TOKEN:?is not set}" + +sudo curl -sSL https://raw.githubusercontent.com/ros/rosdistro/master/ros.key -o /usr/share/keyrings/ros-archive-keyring.gpg +echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/ros-archive-keyring.gpg] http://packages.ros.org/ros2/ubuntu $(source /etc/os-release && echo "$UBUNTU_CODENAME") main" | sudo tee /etc/apt/sources.list.d/ros2.list >/dev/null +sudo -E apt-get -y update +sudo -E apt-get -y install usbutils # For kvaser + +export GITHUB_TOKEN="$WEBAUTO_CI_GITHUB_TOKEN" +git config --global --add url."https://${GITHUB_TOKEN}:x-oauth-basic@github.com/".insteadOf "https://github.com/" +ansible_args=() +ansible_args+=("--extra-vars" "prompt_install_nvidia=y") +ansible_args+=("--extra-vars" "prompt_download_artifacts=y") +ansible_args+=("--extra-vars" "data_dir=$HOME/autoware_data") + +# read amd64 env file and expand ansible arguments +source 'amd64.env' +while read -r env_name; do + ansible_args+=("--extra-vars" "${env_name}=${!env_name}") +done < <(sed "s/=.*//" Date: Mon, 21 Oct 2024 12:02:00 +0900 Subject: [PATCH 14/14] Update run.sh --- .webauto-ci/main/autoware-setup/run.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.webauto-ci/main/autoware-setup/run.sh b/.webauto-ci/main/autoware-setup/run.sh index 03ac5ed4bc9..48f93e3ac03 100755 --- a/.webauto-ci/main/autoware-setup/run.sh +++ b/.webauto-ci/main/autoware-setup/run.sh @@ -8,6 +8,8 @@ sudo -E apt-get -y install usbutils # For kvaser export GITHUB_TOKEN="$WEBAUTO_CI_GITHUB_TOKEN" git config --global --add url."https://${GITHUB_TOKEN}:x-oauth-basic@github.com/".insteadOf "https://github.com/" +git config --global --add url."https://${GITHUB_TOKEN}:x-oauth-basic@github.com/".insteadOf "git@github.com:" + ansible_args=() ansible_args+=("--extra-vars" "prompt_install_nvidia=y") ansible_args+=("--extra-vars" "prompt_download_artifacts=y")