Lint all the things.

playingfield · Jan 7, 2025 · b160be9 · b160be9
1 parent 00f3292
commit b160be9
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/.ansible-lint b/.ansible-lint
@@ -1,7 +1,9 @@
 ---
 # https://ansible-lint.readthedocs.io/en/latest/default_rules/
 exclude_paths:
-  - galaxy_roles/
+  - roles/andrewrothstein.*
+  - roles/bbaassssiiee.*
+  - roles/geerlingguy.*
   - .github/
 
 skip_list:

diff --git a/roles/api/tasks/credentials.yml b/roles/api/tasks/credentials.yml
@@ -98,7 +98,7 @@
       register: "ssh_key_inventory"
       failed_when: false
 
-    - name: "Key Store - {{ inventory_user}}-ssh-key"
+    - name: "Key Store - ssh key for {{ inventory_user }}"
       changed_when: "semaphore_key_inventory_created.status == 204"
       ansible.builtin.uri:
         use_proxy: false
@@ -109,7 +109,7 @@
         body: >-
           {
             "project_id": {{ semaphore_project_id | int }},
-            "name": "{{ inventory_user}}-ssh-key",
+            "name": "{{ inventory_user }}-ssh-key",
             "type": "ssh",
             "login": "{{ inventory_user }}",
             "ssh":

diff --git a/roles/api/tasks/present.yml b/roles/api/tasks/present.yml
@@ -12,5 +12,5 @@
 - name: Credentials
   ansible.builtin.include_tasks: credentials.yml
 
-#- name: Repositories
-#  ansible.builtin.include_tasks: repositories.yml
+# - name: Repositories
+#   ansible.builtin.include_tasks: repositories.yml
diff --git a/roles/api/tasks/repositories.yml b/roles/api/tasks/repositories.yml
@@ -34,8 +34,6 @@
         status_code: 204
         timeout: 5
       register: semaphore_repository_created
-#      when:
-#        (semaphore_repositories.json | length == 0) or ("semaphore_repositories.json | selectattr('name', 'equalto', controller_repository_name) | length == 0")
 
     - name: "Determine Repositories (after creation)"
       changed_when: false

diff --git a/roles/semaphore/tasks/present.yml b/roles/semaphore/tasks/present.yml
@@ -58,6 +58,7 @@
 
     - name: Set semaphore_download_url
       ansible.builtin.set_fact:
+        # yamllint disable-line rule:line-length
         semaphore_download_url: "{{ semaphore_releases_url }}/{{ _sem_rel.json.name }}/semaphore_{{ semaphore_version }}_linux_{{ semaphore_pkg_arch }}.{{ semaphore_pkg_ext }}"
 
 - name: Install Semaphore package
@@ -112,6 +113,7 @@
     - /home/semaphore/tmp
 
 - name: Create python3.12 venv
+  become: true
   become_user: semaphore
   ansible.builtin.command: /usr/bin/python3.12 -m venv venv --upgrade-deps
   args: