Initial Zuul config and testing migration

Author: mnasiadka

.ansible-lint

@@ -5,6 +5,12 @@ exclude_paths:
   - changelogs/
   - .github/
 
+mock_roles:
+  - ensure-docker
+  - ensure-pip
+  - ensure-podman
+  - ensure-output-dirs
+
 skip_list:
   - var-naming[no-role-prefix]
 

.github/workflows/test.yml

@@ -9,24 +9,6 @@ on:
       - master
 
 jobs:
-  lint:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-    steps:
-      # Checks-out the repository under $GITHUB_WORKSPACE, so it's accessible to the job
-      - uses: actions/checkout@v3
-
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install -r test-requirements.txt
-
-      - name: Linting code
-        run: |
-          ansible-lint -v --force-color
-          antsibull-changelog lint
-
   ansible-test:
     runs-on: ubuntu-latest
     strategy:

.gitignore

@@ -3,6 +3,7 @@
 
 # ansible-test output
 /tests/output
+/.ansible
 
 # Byte-compiled / optimized / DLL files
 __pycache__/

lint-requirements.txt

@@ -0,0 +1,3 @@
+ansible
+ansible-lint<26
+antsibull-changelog

roles/cephadm/tasks/bootstrap.yml

@@ -43,6 +43,7 @@
     cmd: "cephadm shell -- ceph config set mon public_network {{ cephadm_public_network }}"
   become: true
   changed_when: true
+  when: cephadm_public_network | length > 0
 
 - name: Set cluster network
   command:
@@ -67,15 +68,16 @@
 
 - name: Get cluster fsid
   command:
-    cmd: "cephadm shell -- ceph fsid"
+    cmd: "cephadm ls --no-detail"
   when: cephadm_fsid | length == 0
   become: true
   changed_when: false
   register: cephadm_fsid_current
 
 - name: Template out cluster.yml
   vars:
-    fsid: "{{ cephadm_fsid if cephadm_fsid | length > 0 else cephadm_fsid_current.stdout }}"
+    current_fsid: "{{ cephadm_fsid_current.stdout | from_json | selectattr('name', 'search', 'mon') | map(attribute='fsid') | first }}"
+    fsid: "{{ cephadm_fsid if cephadm_fsid | length > 0 else current_fsid }}"
   template:
     src: "templates/cluster.yml.j2"
     dest: "/var/run/ceph/{{ fsid }}/cephadm_cluster.yml"

roles/cephadm/tasks/prechecks.yml

@@ -1,4 +1,19 @@
 ---
+- name: Assert that required Ansible groups exist
+  ansible.builtin.assert:
+    that: "'{{ item }}' in group_names"
+    msg: "Ansible '{{ item }}' group does not exist - please create one"
+  loop:
+    - ceph
+    - mons
+    - mgrs
+    - osds
+
+- name: Assert that cephadm_public_interface is set
+  ansible.builtin.assert:
+    that: cephadm_public_interface | length > 0
+    msg: "Ansible Cephadm interface variable 'cephadm_public_interface' is not set"
+
 - name: Populate service facts
   service_facts:
 

roles/cephadm/templates/cluster.yml.j2

@@ -2,7 +2,7 @@
 ---
 service_type: host
 hostname: {{ hostvars[host].ansible_facts.nodename }}
-{% set cephadm_admin_interface = hostvars[host]['cephadm_admin_interface'] %}
+{% set cephadm_admin_interface = hostvars[host]['cephadm_admin_interface'] | default(cephadm_admin_interface) %}
 addr: {{ hostvars[host]['ansible_facts'][cephadm_admin_interface | replace('-', '_')]['ipv4']['address'] }}
 labels:
 {% if host in groups['mons'] %}

test-requirements.txt

@@ -1,5 +1,5 @@
 ansible>=2.9
-ansible-lint<7
+ansible-lint<26
 antsibull-changelog
 mock
 pytest

tests/playbooks/post.yml

@@ -0,0 +1,11 @@
+---
+- name: Prepare logs
+  hosts: all
+  vars:
+    zuul_output_dir: "{{ ansible_user_dir }}/zuul-output"
+  tasks:
+    - name: Print all facts
+      copy:
+        content: "{{ hostvars[inventory_hostname] | to_nice_json }}"
+        dest: "{{ zuul_output_dir }}/facts.json"
+        mode: "0600"

tests/playbooks/pre.yml

@@ -0,0 +1,13 @@
+---
+- name: Prepare environment
+  hosts: all
+  any_errors_fatal: true
+  vars:
+    logs_dir: "/tmp/logs"
+  roles:
+    - ensure-output-dirs
+    - ensure-pip
+    - role: "ensure-docker"
+      when: cephadm_container_engine == "docker"
+    - role: "ensure-podman"
+      when: cephadm_container_engine == "podman"