Merge pull request #350 from OpenVoiceOS/fix/ansible_lint

[linting] Fix ansible-lint error

Author: goldyfruit

.github/workflows/scenarios-ubuntu2404.yml

@@ -21,7 +21,9 @@ jobs:
 
       - name: Uninstall existing instance
         run: |
-          sh -c "curl -s https://raw.githubusercontent.com/OpenVoiceOS/ovos-installer/main/installer.sh -o installer.sh && chmod +x installer.sh && sudo ./installer.sh -u"
+          curl -s https://raw.githubusercontent.com/OpenVoiceOS/ovos-installer/main/installer.sh -o installer.sh
+          chmod +x installer.sh
+          sudo ./installer.sh -u
 
       - name: Scenario containers, development, ovos, skills
         run: |
@@ -40,4 +42,6 @@ jobs:
           share_telemetry: false
           share_usage_telemetry: false
           EOF
-          sh -c "curl -s https://raw.githubusercontent.com/OpenVoiceOS/ovos-installer/main/installer.sh -o installer.sh && chmod +x installer.sh && sudo ./installer.sh"
+          curl -s https://raw.githubusercontent.com/OpenVoiceOS/ovos-installer/main/installer.sh -o installer.sh
+          chmod +x installer.sh
+          sudo ./installer.sh

.github/workflows/sync_tx.yml

@@ -19,17 +19,14 @@ jobs:
         uses: actions/setup-python@v4
         with:
           python-version: 3.9
-          
       - name: Run script if manual dispatch
         if: github.event_name == 'workflow_dispatch'
         run: |
           python scripts/sync_translations.py
-          
       - name: Run script if merged by gitlocalize-app[bot]
         if: github.event_name == 'push' && github.event.head_commit.author.username == 'gitlocalize-app[bot]'
         run: |
           python scripts/sync_translations.py
-          
       - name: Commit to main
         uses: stefanzweifel/git-auto-commit-action@v4
         with:

ansible/roles/ovos_hardware_mark1/handlers/main.yml

@@ -8,4 +8,4 @@
 
 - name: Set Reboot
   ansible.builtin.set_fact:
-    ovos_installer_reboot: true
+    ovos_installer_reboot: true  # noqa var-naming

ansible/roles/ovos_hardware_mark1/tasks/config.yml

@@ -2,11 +2,11 @@
 - name: Check for /boot/firmware directory
   ansible.builtin.stat:
     path: /boot/firmware
-  register: _boot_config_status
+  register: ovos_hardware_mark1_boot_config_status
 
-- name: Set _boot_directory fact
+- name: Set ovos_hardware_mark1_boot_directory fact
   ansible.builtin.set_fact:
-    _boot_directory: "{{ '/boot/firmware' if _boot_config_status.stat.exists | bool else '/boot' }}"
+    ovos_hardware_mark1_boot_directory: "{{ '/boot/firmware' if ovos_hardware_mark1_boot_config_status.stat.exists | bool else '/boot' }}"
 
 - name: Manage TTY and soundcard overlays
   ansible.builtin.lineinfile:
@@ -20,7 +20,7 @@
 
 - name: Disable snd_bcm2835 audio interface
   ansible.builtin.lineinfile:
-    path: "{{ _boot_directory }}/config.txt"
+    path: "{{ ovos_hardware_mark1_boot_directory }}/config.txt"
     regexp: "^{{ item.key }}="
     line: "{{ item.key }}={{ item.value }}"
   notify: Set Reboot
@@ -29,7 +29,7 @@
 
 - name: Redirect console to tty1 only
   ansible.builtin.replace:
-    path: "{{ _boot_directory }}/cmdline.txt"
+    path: "{{ ovos_hardware_mark1_boot_directory }}/cmdline.txt"
     regexp: '\bconsole=serial0,115200\b\s?'
     replace: ""
   notify: Set Reboot

ansible/roles/ovos_hardware_mark1/tasks/prepare.yml

@@ -1,5 +1,5 @@
 ---
-- name: Add {{ ovos_installer_user }} to dialout group
+- name: Add installer user to dialout group
   ansible.builtin.user:
     name: "{{ ovos_installer_user }}"
     groups: dialout
@@ -16,7 +16,7 @@
     - "{{ ovos_installer_user_home }}/.config/systemd/user"
     - "{{ _ovos_hardware_mark1_workind_directory }}"
 
-- name: Configure initialize.sh to {{ _ovos_hardware_mark1_workind_directory }}
+- name: Configure initialize.sh in work directory
   ansible.builtin.copy:
     src: initialize.sh
     dest: "{{ _ovos_hardware_mark1_workind_directory }}/initialize.sh"

ansible/roles/ovos_hardware_mark2/handlers/main.yml

@@ -14,4 +14,4 @@
 
 - name: Set Reboot
   ansible.builtin.set_fact:
-    ovos_installer_reboot: true
+    ovos_installer_reboot: true  # noqa var-naming

ansible/roles/ovos_hardware_mark2/meta/main.yml

@@ -25,3 +25,5 @@ galaxy_info:
     - mark2
 
 dependencies: []
+collections:
+  - moreati.uv

ansible/roles/ovos_hardware_mark2/tasks/firmware.yml

@@ -14,12 +14,12 @@
 - name: Update EEPROM
   ansible.builtin.command:
     cmd: rpi-eeprom-update -a
-  register: _eeprom_status
+  register: ovos_hardware_mark2_eeprom_status
   changed_when: false
 
-- name: Set ovos_installer_reboot fact (EEPROM)
+- name: Set ovos_hardware_mark2_reboot fact (EEPROM)
   vars:
-    _eeprom_reboot: "{{ _eeprom_status.stdout | regex_search('reboot') }}"
+    ovos_hardware_mark2_eeprom_reboot: "{{ ovos_hardware_mark2_eeprom_status.stdout | regex_search('reboot') }}"
   ansible.builtin.set_fact:
-    ovos_installer_reboot: true
-  when: _eeprom_status is defined and _eeprom_reboot | length > 0
+    ovos_installer_reboot: true  # noqa var-naming
+  when: ovos_hardware_mark2_eeprom_status is defined and ovos_hardware_mark2_eeprom_reboot | length > 0

ansible/roles/ovos_hardware_mark2/tasks/prepare.yml

@@ -14,8 +14,8 @@
 - name: Check for /boot/firmware directory
   ansible.builtin.stat:
     path: /boot/firmware
-  register: _boot_config_status
+  register: ovos_hardware_mark2_boot_config_status
 
-- name: Set _boot_directory fact
+- name: Set ovos_hardware_mark2_boot_directory fact
   ansible.builtin.set_fact:
-    _boot_directory: "{{ '/boot/firmware' if _boot_config_status.stat.exists | bool else '/boot' }}"
+    ovos_hardware_mark2_boot_directory: "{{ '/boot/firmware' if ovos_hardware_mark2_boot_config_status.stat.exists | bool else '/boot' }}"

ansible/roles/ovos_hardware_mark2/tasks/vocalfusion.yml

@@ -22,21 +22,21 @@
     - sj201-rev10-pwm-fan-overlay
 
 - name: Manage sj201, buttons and PWM overlays
-  vars:
-    _is_rpi5: "{{ '-pi5' if 'Raspberry Pi 5' in ovos_installer_raspberrypi else '' }}"
   ansible.builtin.lineinfile:
-    path: "{{ _boot_directory }}/config.txt"
+    path: "{{ ovos_hardware_mark2_boot_directory }}/config.txt"
     regexp: "^{{ item }}="
-    line: "{{ item }}{{ _is_rpi5 }}"
+    line: "{{ item }}{{ '-pi5' if 'Raspberry Pi 5' in ovos_installer_raspberrypi else '' }}"
   loop:
     - dtoverlay=sj201
     - dtoverlay=sj201-buttons-overlay
     - dtoverlay=sj201-rev10-pwm-fan-overlay
 
 - name: Build vocalfusion-soundcard.ko kernel module
   ansible.builtin.shell:
-    cmd: |
-      sudo make -j {{ ansible_processor_count }} KDIR=/lib/modules/{{ ansible_kernel }}/build all
+    cmd: >
+      sudo make -j {{ ansible_processor_count }}
+      KDIR=/lib/modules/{{ ansible_kernel }}/build
+      all
     executable: /bin/bash
     chdir: "{{ _ovos_hardware_mark2_vocalfusion_src_path }}/driver"
   changed_when: false
@@ -61,7 +61,7 @@
     group: root
     mode: "0644"
 
-- name: Create {{ ovos_installer_user_home }}/.venvs/sj201 Python
+- name: Create sj201 Python virtualenv
   moreati.uv.pip:
     name:
       - Adafruit-Blinka
@@ -79,18 +79,14 @@
     group: root
     mode: "0755"
   loop:
-    - {
-        "url": "https://raw.githubusercontent.com/OpenVoiceOS/ovos-buildroot/0e464466194f58553af11c34f7435dba76ec70a3/buildroot-external/package/vocalfusion/xvf3510-flash",
-        "dest": "xvf3510-flash",
-      }
-    - {
-        "url": "https://raw.githubusercontent.com/OpenVoiceOS/ovos-buildroot/c67d7f0b7f2a3eff5faab96d6adf7495e9b48b93/buildroot-external/package/vocalfusion/app_xvf3510_int_spi_boot_v4_2_0.bin",
-        "dest": "app_xvf3510_int_spi_boot_v4_2_0.bin",
-      }
-    - {
-        "url": "https://raw.githubusercontent.com/MycroftAI/mark-ii-hardware-testing/main/utils/init_tas5806.py",
-        "dest": "init_tas5806",
-      }
+    - url: >-
+        https://raw.githubusercontent.com/OpenVoiceOS/ovos-buildroot/0e464466194f58553af11c34f7435dba76ec70a3/buildroot-external/package/vocalfusion/xvf3510-flash
+      dest: xvf3510-flash
+    - url: >-
+        https://raw.githubusercontent.com/OpenVoiceOS/ovos-buildroot/c67d7f0b7f2a3eff5faab96d6adf7495e9b48b93/buildroot-external/package/vocalfusion/app_xvf3510_int_spi_boot_v4_2_0.bin
+      dest: app_xvf3510_int_spi_boot_v4_2_0.bin
+    - url: https://raw.githubusercontent.com/MycroftAI/mark-ii-hardware-testing/main/utils/init_tas5806.py
+      dest: init_tas5806
 
 - name: Copy SJ201 systemd unit file
   ansible.builtin.template:
@@ -113,7 +109,7 @@
     force: true
     scope: user
 
-- name: Delete {{ _ovos_hardware_mark2_vocalfusion_src_path }} once compiled
+- name: Delete vocalfusion source once compiled
   ansible.builtin.file:
     path: "{{ _ovos_hardware_mark2_vocalfusion_src_path }}"
     state: absent