Apply the CodeRabbit recommendations

Author: goldyfruit

ansible/roles/ovos_config/defaults/main.yml

@@ -18,7 +18,7 @@ ovos_config_backup_paths_common:
 ovos_config_backup_paths: >-
   {{
     ovos_config_backup_paths_common
-    + ([ovos_installer_user_home + '/.config/systemd/user/*'] if ansible_facts.system == 'Linux' else [])
+    + ([ovos_installer_user_home + '/.config/systemd/user/*'] if (ansible_facts.system | default('')) == 'Linux' else [])
   }}
 ovos_config_backup_dest: "{{ ovos_installer_user_home }}/ovos-backup.tar.gz"
 ovos_config_backup_owner: "{{ ovos_installer_user }}"
@@ -33,7 +33,7 @@ ovos_config_container_dir_owner: "{{ ovos_installer_user }}"
 ovos_config_container_dir_group: "{{ ovos_installer_group }}"
 ovos_config_container_dir_mode: "0755"
 ovos_config_container_directories:
-  - { path: "{{ ovos_installer_user_home }}/.config/systemd/user", enabled: "{{ ansible_facts.system == 'Linux' }}" }
+  - { path: "{{ ovos_installer_user_home }}/.config/systemd/user", enabled: "{{ (ansible_facts.system | default('')) == 'Linux' }}" }
   - { path: "{{ ovos_installer_user_home }}/ovos", enabled: true }
   - { path: "{{ ovos_installer_user_home }}/ovos/config", enabled: true }
   - { path: "{{ ovos_installer_user_home }}/ovos/config/persona", enabled: true }
@@ -53,7 +53,7 @@ ovos_config_virtualenv_directories:
   - { path: "{{ ovos_installer_user_home }}/.local", enabled: true }
   - { path: "{{ ovos_installer_user_home }}/.local/bin", enabled: true }
   - { path: "{{ ovos_installer_user_home }}/.config/hivemind", enabled: "{{ ovos_installer_profile != 'ovos' }}" }
-  - { path: "{{ ovos_installer_user_home }}/.config/systemd/user", enabled: "{{ ansible_facts.system == 'Linux' }}" }
+  - { path: "{{ ovos_installer_user_home }}/.config/systemd/user", enabled: "{{ (ansible_facts.system | default('')) == 'Linux' }}" }
   - { path: "{{ ovos_installer_user_home }}/nltk_data", enabled: true }
 
 ovos_config_geoip_url: "{{ ovos_installer_geoip_url }}"

ansible/roles/ovos_virtualenv/tasks/venv.yml

@@ -290,6 +290,7 @@
     PATH: "{{ ovos_virtualenv_uv_exec_path }}"
     UV_CACHE_DIR: "{{ ovos_virtualenv_uv_cache_dir }}"
   when:
+    - not (ovos_installer_cleaning | default(false) | bool)
     - ovos_installer_cpu_is_capable | bool
     - ansible_facts.system != 'Darwin'
 
@@ -304,6 +305,7 @@
     PATH: "{{ ovos_virtualenv_uv_exec_path }}"
     UV_CACHE_DIR: "{{ ovos_virtualenv_uv_cache_dir }}"
   when:
+    - not (ovos_installer_cleaning | default(false) | bool)
     - ansible_facts.system == 'Darwin' or not (ovos_installer_cpu_is_capable | bool)
 
 - name: Install ggwave Python library
@@ -317,7 +319,9 @@
     HOME: "{{ ovos_installer_user_home }}"
     PATH: "{{ ovos_virtualenv_uv_exec_path }}"
     UV_CACHE_DIR: "{{ ovos_virtualenv_uv_cache_dir }}"
-  when: ovos_installer_enable_ggwave | bool
+  when:
+    - not (ovos_installer_cleaning | default(false) | bool)
+    - ovos_installer_enable_ggwave | bool
 
 - name: Install Open Voice OS in Python venv
   become: true
@@ -367,6 +371,7 @@
     HOME: "{{ ovos_installer_user_home }}"
     PATH: "{{ ovos_virtualenv_uv_exec_path }}"
     UV_CACHE_DIR: "{{ ovos_virtualenv_uv_cache_dir }}"
+  when: not (ovos_installer_cleaning | default(false) | bool)
 
 - name: Ensure setuptools Python library is compatible with OVOS runtime
   become: true
@@ -379,6 +384,7 @@
     HOME: "{{ ovos_installer_user_home }}"
     PATH: "{{ ovos_virtualenv_uv_exec_path }}"
     UV_CACHE_DIR: "{{ ovos_virtualenv_uv_cache_dir }}"
+  when: not (ovos_installer_cleaning | default(false) | bool)
 
 - name: Check ovos virtualenv activate script exists
   ansible.builtin.stat:

tests/bats/code_quality.bats

@@ -409,6 +409,25 @@ function setup() {
     assert_success
 }
 
+@test "virtualenv_uv_bootstrap_and_runtime_installs_skip_cleaning" {
+    local file="ansible/roles/ovos_virtualenv/tasks/venv.yml"
+
+    run bash -c "grep -A12 -F -- \"- name: Install tflite_runtime bootstrap package (non-macOS AVX/SIMD hosts)\" \"$file\" | grep -F -q -- 'not (ovos_installer_cleaning | default(false) | bool)'"
+    assert_success
+
+    run bash -c "grep -A12 -F -- \"- name: Install wheel bootstrap package (macOS or non-AVX/SIMD hosts)\" \"$file\" | grep -F -q -- 'not (ovos_installer_cleaning | default(false) | bool)'"
+    assert_success
+
+    run bash -c "grep -A12 -F -- \"- name: Install ggwave Python library\" \"$file\" | grep -F -q -- 'not (ovos_installer_cleaning | default(false) | bool)'"
+    assert_success
+
+    run bash -c "grep -A12 -F -- \"- name: Ensure numpy Python library is installed\" \"$file\" | grep -F -q -- 'not (ovos_installer_cleaning | default(false) | bool)'"
+    assert_success
+
+    run bash -c "grep -A12 -F -- \"- name: Ensure setuptools Python library is compatible with OVOS runtime\" \"$file\" | grep -F -q -- 'not (ovos_installer_cleaning | default(false) | bool)'"
+    assert_success
+}
+
 @test "virtualenv_repairs_ownership_before_python_package_installs" {
     local file="ansible/roles/ovos_virtualenv/tasks/venv.yml"
 
@@ -428,6 +447,13 @@ function setup() {
     assert_success
 }
 
+@test "ovos_config_defaults_guard_ansible_facts_system_references" {
+    local file="ansible/roles/ovos_config/defaults/main.yml"
+
+    run grep -F -q "(ansible_facts.system | default('')) == 'Linux'" "$file"
+    assert_success
+}
+
 @test "macos_fann2_build_has_swig2_compatibility_shim" {
     run grep -q "Resolve swig binary path for fann2 builds (macOS)" ansible/roles/ovos_virtualenv/tasks/packages.yml
     assert_success
@@ -491,13 +517,13 @@ function setup() {
     run grep -q "ovos_config_backup_paths_common" ansible/roles/ovos_config/defaults/main.yml
     assert_success
 
-    run grep -q "ansible_facts.system == 'Linux'" ansible/roles/ovos_config/defaults/main.yml
+    run grep -q "(ansible_facts.system | default('')) == 'Linux'" ansible/roles/ovos_config/defaults/main.yml
     assert_success
 
-    run grep -F -q '.config/systemd/user", enabled: "{{ ansible_facts.system == '\''Linux'\'' }}"' ansible/roles/ovos_config/defaults/main.yml
+    run grep -F -q "enabled: \"{{ (ansible_facts.system | default('')) == 'Linux' }}\"" ansible/roles/ovos_config/defaults/main.yml
     assert_success
 
-    run grep -F -q "/.config/systemd/user/*'] if ansible_facts.system == 'Linux' else []" ansible/roles/ovos_config/defaults/main.yml
+    run grep -F -q "/.config/systemd/user/*'] if (ansible_facts.system | default('')) == 'Linux' else []" ansible/roles/ovos_config/defaults/main.yml
     assert_success
 }
 
@@ -676,6 +702,14 @@ function setup() {
     assert_failure
 }
 
+@test "launchd_install_uses_collection_module_only" {
+    run grep -q "community.general.launchd" ansible/roles/ovos_services/tasks/launchd.yml
+    assert_success
+
+    run grep -q "launchctl" ansible/roles/ovos_services/tasks/launchd.yml
+    assert_failure
+}
+
 @test "launchd_uninstall_removes_plists_with_privilege_escalation" {
     run bash -c "grep -A4 -F -- \"- name: Remove OVOS launchd plist files\" ansible/roles/ovos_services/tasks/uninstall-launchd.yml | grep -q -- \"become: true\""
     assert_success
@@ -706,6 +740,19 @@ function setup() {
     assert_success
 }
 
+@test "mycroft_conf_sanitizes_timezone_prefix" {
+    run grep -F -q "regex_replace('(?i)^\\\\s*time\\\\s*zone\\\\s*:\\\\s*', '')" ansible/roles/ovos_config/templates/mycroft.conf.j2
+    assert_success
+}
+
+@test "macos_cpu_detection_queries_leaf7_only_on_intel" {
+    run grep -q 'machine_arch="$(uname -m' utils/common.sh
+    assert_success
+
+    run bash -c 'grep -A4 -F -- "if [ \"\$machine_arch\" = \"x86_64\" ]; then" utils/common.sh | grep -q "machdep.cpu.leaf7_features"'
+    assert_success
+}
+
 @test "macos_scenario_smoke_runs_on_intel_and_arm" {
     # Keep a generous context window because this job block may grow over time.
     # When GitHub retires macos-15-intel, update the Intel runner assertion below.