Skip to content

Commit b21d086

Browse files
committed
fix(ansible): skip ros-apt-source download in locked mode
Wrap ros-apt-source download tasks in a block with when condition to skip network access when using locked versions. The APT source is already configured in locked environments. Signed-off-by: Yutaka Kondo <yutaka.kondo@youtalk.jp>
1 parent a1b3ddb commit b21d086

1 file changed

Lines changed: 31 additions & 27 deletions

File tree

ansible/roles/ros2/tasks/main.yaml

Lines changed: 31 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,38 @@
1-
- name: Get latest release information of ros-apt-source package
2-
ansible.builtin.uri:
3-
url: https://api.github.com/repos/ros-infrastructure/ros-apt-source/releases/latest
4-
method: GET
5-
return_content: true
6-
register: ros2__ros_apt_release_info
1+
- name: Download and install ros-apt-source package
2+
when: not (use_locked_versions | default(false) | bool)
3+
block:
4+
- name: Get latest release information of ros-apt-source package
5+
ansible.builtin.uri:
6+
url: https://api.github.com/repos/ros-infrastructure/ros-apt-source/releases/latest
7+
method: GET
8+
return_content: true
9+
register: ros2__ros_apt_release_info
710

8-
- name: Extract latest version of ros-apt-source package
9-
ansible.builtin.set_fact:
10-
ros2__ros_apt_source_version: "{{ (ros2__ros_apt_release_info.content | from_json).tag_name }}"
11+
- name: Extract latest version of ros-apt-source package
12+
ansible.builtin.set_fact:
13+
ros2__ros_apt_source_version: "{{ (ros2__ros_apt_release_info.content | from_json).tag_name }}"
1114

12-
- name: Save result of 'source /etc/os-release && echo $UBUNTU_CODENAME'
13-
ansible.builtin.shell: bash -c 'source /etc/os-release && echo $UBUNTU_CODENAME'
14-
register: ros2__ubuntu_codename
15-
changed_when: false
15+
- name: Save result of 'source /etc/os-release && echo $UBUNTU_CODENAME'
16+
ansible.builtin.shell: bash -c 'source /etc/os-release && echo $UBUNTU_CODENAME'
17+
register: ros2__ubuntu_codename
18+
changed_when: false
1619

17-
- name: Get ros2-apt-source package
18-
ansible.builtin.get_url:
19-
url: https://github.com/ros-infrastructure/ros-apt-source/releases/download/{{ ros2__ros_apt_source_version }}/ros2-apt-source_{{ ros2__ros_apt_source_version }}.{{ ros2__ubuntu_codename.stdout }}_all.deb
20-
dest: /tmp/ros2-apt-source.deb
21-
mode: "0644"
20+
- name: Get ros2-apt-source package
21+
ansible.builtin.get_url:
22+
url: https://github.com/ros-infrastructure/ros-apt-source/releases/download/{{ ros2__ros_apt_source_version }}/ros2-apt-source_{{ ros2__ros_apt_source_version }}.{{ ros2__ubuntu_codename.stdout }}_all.deb
23+
dest: /tmp/ros2-apt-source.deb
24+
mode: "0644"
2225

23-
- name: Install ros2-apt-source package
24-
ansible.builtin.apt:
25-
deb: /tmp/ros2-apt-source.deb
26-
state: present
27-
become: true
26+
- name: Install ros2-apt-source package
27+
ansible.builtin.apt:
28+
deb: /tmp/ros2-apt-source.deb
29+
state: present
30+
become: true
2831

29-
- name: Delete installed .deb file
30-
ansible.builtin.file:
31-
path: /tmp/ros2-apt-source.deb
32-
state: absent
32+
- name: Delete installed .deb file
33+
ansible.builtin.file:
34+
path: /tmp/ros2-apt-source.deb
35+
state: absent
3336

3437
- name: Hold check of ros-{{ rosdistro + '-' + ros2_installation_type }}
3538
ansible.builtin.command: apt-mark showhold
@@ -41,6 +44,7 @@
4144
ansible.builtin.apt:
4245
name: ros-{{ rosdistro }}-{{ ros2_installation_type }}
4346
state: latest
47+
allow_downgrade: "{{ use_locked_versions | default(false) | bool }}"
4448
update_cache: true
4549
when: "'ros-' + rosdistro + '-' + ros2_installation_type not in ros2_held_ros_packages.stdout"
4650
register: ros2_install_result

0 commit comments

Comments
 (0)