simplifies molecule config and removes old distros

idiv-biodiversity · Jan 30, 2025 · d67a063 · d67a063
1 parent dbfb111
commit d67a063
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 113 deletions.
diff --git a/.config/molecule/config.yml b/.config/molecule/config.yml
@@ -0,0 +1,28 @@
+---
+
+dependency:
+  name: galaxy
+
+driver:
+  name: docker
+
+platforms:
+
+  - name: rockylinux-9
+    image: ghcr.io/hspaans/molecule-containers:rockylinux-9
+    pre_build_image: yes
+    privileged: yes
+    groups:
+      - nosudo
+
+provisioner:
+  name: ansible
+  inventory:
+    group_vars:
+      nosudo:
+        ansible_become_method: su
+
+verifier:
+  name: ansible
+
+...
diff --git a/.github/workflows/ansible.yml b/.github/workflows/ansible.yml
@@ -25,10 +25,7 @@ jobs:
       fail-fast: false
       matrix:
         distro:
-          - centos-7
-          - centos-8
-          - rocky-8
-          - rocky-9
+          - rockylinux-9
         scenario:
           - default
           - alternative

diff --git a/meta/main.yml b/meta/main.yml
@@ -21,8 +21,6 @@ galaxy_info:
 
     - name: EL
       versions:
-        - '7'
-        - '8'
         - '9'
 
   galaxy_tags:

diff --git a/molecule/alternative/converge.yml b/molecule/alternative/converge.yml
diff --git a/molecule/alternative/molecule.yml b/molecule/alternative/molecule.yml
@@ -1,50 +1,8 @@
 ---
 
-dependency:
-  name: galaxy
-
-driver:
-  name: docker
-
-platforms:
-
-  - name: centos-7
-    image: geerlingguy/docker-centos7-ansible
-    command: ${MOLECULE_DOCKER_COMMAND:-""}
-    volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:rw
-    cgroupns_mode: host
-    privileged: yes
-    pre_build_image: yes
-
-  - name: centos-8
-    image: geerlingguy/docker-centos8-ansible
-    command: ${MOLECULE_DOCKER_COMMAND:-""}
-    volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:rw
-    cgroupns_mode: host
-    privileged: yes
-    pre_build_image: yes
-
-  - name: rocky-8
-    image: geerlingguy/docker-rockylinux8-ansible
-    command: ${MOLECULE_DOCKER_COMMAND:-""}
-    volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:rw
-    cgroupns_mode: host
-    privileged: yes
-    pre_build_image: yes
-
-  - name: rocky-9
-    image: geerlingguy/docker-rockylinux9-ansible
-    command: ${MOLECULE_DOCKER_COMMAND:-""}
-    volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:rw
-    cgroupns_mode: host
-    privileged: yes
-    pre_build_image: yes
-
 provisioner:
+  playbooks:
+    converge: ../default/converge.yml
   name: ansible
   inventory:
     group_vars:
@@ -53,7 +11,4 @@ provisioner:
         rclone_binary_install_bin_dir: /opt/usr/local/bin
         rclone_binary_install_cache_dir: /opt/var/cache
 
-verifier:
-  name: ansible
-
 ...
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
@@ -1,53 +1,3 @@
 ---
 
-dependency:
-  name: galaxy
-
-driver:
-  name: docker
-
-platforms:
-
-  - name: centos-7
-    image: geerlingguy/docker-centos7-ansible
-    command: ${MOLECULE_DOCKER_COMMAND:-""}
-    volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:rw
-    cgroupns_mode: host
-    privileged: yes
-    pre_build_image: yes
-
-  - name: centos-8
-    image: geerlingguy/docker-centos8-ansible
-    command: ${MOLECULE_DOCKER_COMMAND:-""}
-    volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:rw
-    cgroupns_mode: host
-    privileged: yes
-    pre_build_image: yes
-
-  - name: rocky-8
-    image: geerlingguy/docker-rockylinux8-ansible
-    command: ${MOLECULE_DOCKER_COMMAND:-""}
-    volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:rw
-    cgroupns_mode: host
-    privileged: yes
-    pre_build_image: yes
-
-  - name: rocky-9
-    image: geerlingguy/docker-rockylinux9-ansible
-    command: ${MOLECULE_DOCKER_COMMAND:-""}
-    volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:rw
-    cgroupns_mode: host
-    privileged: yes
-    pre_build_image: yes
-
-provisioner:
-  name: ansible
-
-verifier:
-  name: ansible
-
 ...
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,8 +21,6 @@ galaxy_info: @@
         - name: EL
           versions:
-            - '7'
-            - '8'
             - '9'
       galaxy_tags:
@@ Expand Down @@