ci: fix ansible-lint

ci: fix ansible-lint ci: remove .yamllint ci: rl9 test ci: rl9 test ci: rl9 test ci: rl9 test ci: rl9 test ci: u24 test ci: u24 test ci: u24 test ci: u24 test ci: u24 test
lablabs · Jun 5, 2024 · aff4c39 · aff4c39
1 parent 3be4b64
commit aff4c39
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 31 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -24,10 +24,10 @@ jobs:
       fail-fast: ${{ !contains(github.event_name, 'pull_request') }}
       matrix:
         config:
-          - image: "rockylinux8"
+          - image: "rockylinux9"
             cgroup_mode: "host"
             volumes: "rw"
-          - image: "ubuntu2204"
+          - image: "ubuntu2404"
             cgroup_mode: "host"
             volumes: "rw"
     steps:
@@ -62,7 +62,7 @@ jobs:
     strategy:
       matrix:
         config:
-          - image: "ubuntu2204"
+          - image: "ubuntu2404"
             cgroup_mode: "host"
             volumes: "rw"
     steps:

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -14,11 +14,7 @@ jobs:
       - name: checkout
         uses: actions/checkout@v3
         with:
-          path: "${{ github.repository }}"
-      - name: Molecule for Ansible - lint
-        uses: MonolithProjects/[email protected]
-        with:
-          molecule_command: lint
+          path: 'lablabs.rke2'
 
       - name: Set up Python 3
         uses: actions/setup-python@v4
@@ -29,5 +25,5 @@ jobs:
         run: pip3 install ansible-lint
 
       - name: Run ansible-lint
-        run: ansible-lint --profile production .
+        run: ansible-lint --profile production ./tasks
         working-directory: ./lablabs.rke2
diff --git a/.yamllint b/.yamllint
@@ -3,6 +3,11 @@
 extends: default
 
 rules:
+  comments:
+    min-spaces-from-content: 1
+  octal-values:
+    forbid-implicit-octal: false
+    forbid-explicit-octal: true
   braces:
     max-spaces-inside: 1
     level: error
@@ -15,7 +20,6 @@ rules:
   commas:
     max-spaces-after: -1
     level: error
-  comments: disable
   comments-indentation: disable
   document-start: disable
   empty-lines:

diff --git a/README.md b/README.md
@@ -28,9 +28,8 @@ The Role can install the RKE2 in 3 modes:
 
 ## Tested on
 
-* Rocky Linux 8
-* Ubuntu 20.04 LTS
-* Ubuntu 22.04 LTS
+* Rocky Linux 9
+* Ubuntu 24.04 LTS
 
 ## Role Variables
 

diff --git a/molecule/cluster/prepare.yml b/molecule/cluster/prepare.yml
@@ -3,10 +3,16 @@
   hosts: node*
   become: true
   tasks:
-    - name: Install packages
+    - name: Install wget for Ubuntu
       ansible.builtin.package:
         update_cache: true
-        name: "{{ item }}"
-      loop:
-        - wget
-        - curl
+        name:
+          - wget
+      when: ansible_distribution == "Ubuntu"
+
+    - name: Install iproute for RockyLinux
+      ansible.builtin.package:
+        update_cache: true
+        name:
+          - iproute
+      when: ansible_distribution == "Rocky"
diff --git a/molecule/default/prepare.yml b/molecule/default/prepare.yml
@@ -3,14 +3,14 @@
   hosts: node*
   become: true
   tasks:
-    - name: Install packages
+    - name: Install wget for Ubuntu
       ansible.builtin.package:
         update_cache: true
         name:
           - wget
-          - curl
+      when: ansible_distribution == "Ubuntu"
 
-    - name: Install special packages for RockyLinux
+    - name: Install iproute for RockyLinux
       ansible.builtin.package:
         update_cache: true
         name:

diff --git a/molecule/ha_cluster/prepare.yml b/molecule/ha_cluster/prepare.yml
@@ -3,10 +3,16 @@
   hosts: node*
   become: true
   tasks:
-    - name: Install packages
+    - name: Install wget for Ubuntu
       ansible.builtin.package:
         update_cache: true
-        name: "{{ item }}"
-      loop:
-        - wget
-        - curl
+        name:
+          - wget
+      when: ansible_distribution == "Ubuntu"
+
+    - name: Install iproute for RockyLinux
+      ansible.builtin.package:
+        update_cache: true
+        name:
+          - iproute
+      when: ansible_distribution == "Rocky"
diff --git a/molecule/ha_cluster_kubevip/prepare.yml b/molecule/ha_cluster_kubevip/prepare.yml
@@ -3,10 +3,16 @@
   hosts: node*
   become: true
   tasks:
-    - name: Install packages
+    - name: Install wget for Ubuntu
       ansible.builtin.package:
         update_cache: true
-        name: "{{ item }}"
-      loop:
-        - wget
-        - curl
+        name:
+          - wget
+      when: ansible_distribution == "Ubuntu"
+
+    - name: Install iproute for RockyLinux
+      ansible.builtin.package:
+        update_cache: true
+        name:
+          - iproute
+      when: ansible_distribution == "Rocky"