Skip to content

Commit

Permalink
ci(pre-commit-ansible): fix errors (#3490)
Browse files Browse the repository at this point in the history
* add additional_dependencies

Signed-off-by: Kenji Miyake <[email protected]>

* fix ansible-lint errors

Signed-off-by: Kenji Miyake <[email protected]>

---------

Signed-off-by: Kenji Miyake <[email protected]>
  • Loading branch information
kenji-miyake authored May 17, 2023
1 parent 391a85b commit fb89617
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .ansible-lint
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ exclude_paths:
- src/

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: []
2 changes: 2 additions & 0 deletions .pre-commit-config-ansible.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@ repos:
rev: v6.16.0
hooks:
- id: ansible-lint
additional_dependencies:
- ansible
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
5 changes: 3 additions & 2 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

- name: Setup Git LFS
command: git lfs install
ansible.builtin.command: git lfs install
when: "'filter.lfs.required' not in git_global_config.config_values"
changed_when: true
2 changes: 1 addition & 1 deletion ansible/roles/rmw_implementation/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
register: dash_case_rmw_implementation
changed_when: false

- name: Install ros-{{ rosdistro }}-{{ dash_case_rmw_implementation.stdout }}
- name: Install ros-{{ rosdistro + '-' + dash_case_rmw_implementation.stdout }}
become: true
ansible.builtin.apt:
name: ros-{{ rosdistro }}-{{ dash_case_rmw_implementation.stdout }}
Expand Down
1 change: 1 addition & 0 deletions ansible/roles/rocker/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
ansible.builtin.get_url:
url: https://raw.githubusercontent.com/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
Expand Down
3 changes: 2 additions & 1 deletion ansible/roles/ros2/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
ansible.builtin.get_url:
url: https://raw.githubusercontent.com/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
Expand All @@ -33,7 +34,7 @@
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

0 comments on commit fb89617

Please sign in to comment.