[feature] Add support for Ubuntu 24.04 and Debian 12

openwisp · Sep 5, 2024 · f87eded · f87eded
1 parent 555778c
commit f87eded
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 1 deletion.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -23,8 +23,12 @@ jobs:
             ansible_interpreter: /usr/bin/python3
           - distro: ubuntu2204
             ansible_interpreter: /usr/bin/python3
+          - distro: ubuntu2404
+            ansible_interpreter: /usr/bin/python3
           - distro: debian11
             ansible_interpreter: /usr/bin/python3
+          - distro: debian12
+            ansible_interpreter: /usr/bin/python3
 
     steps:
       - uses: actions/checkout@v4

diff --git a/README.md b/README.md
@@ -264,8 +264,10 @@ pip install molecule[docker,ansible] yamllint ansible-lint docker
 **Step 4**: Download docker images
 
 ```
+docker pull geerlingguy/docker-ubuntu2404-ansible:latest
 docker pull geerlingguy/docker-ubuntu2204-ansible:latest
 docker pull geerlingguy/docker-ubuntu2004-ansible:latest
+docker pull geerlingguy/docker-debian12-ansible:latest
 docker pull geerlingguy/docker-debian11-ansible:latest
 ```
 

diff --git a/molecule/local/molecule.yml b/molecule/local/molecule.yml
@@ -23,6 +23,14 @@ platforms:
     cgroupns_mode: host
     privileged: true
     pre_build_image: true
+  - name: "openwisp2-ubuntu2404"
+    image: "geerlingguy/docker-ubuntu2404-ansible:latest"
+    command: ${MOLECULE_DOCKER_COMMAND:-""}
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+    cgroupns_mode: host
+    privileged: true
+    pre_build_image: true
   - name: "openwisp2-debian11"
     image: "geerlingguy/docker-debian11-ansible:latest"
     command: ${MOLECULE_DOCKER_COMMAND:-""}
@@ -31,6 +39,14 @@ platforms:
     cgroupns_mode: host
     privileged: true
     pre_build_image: true
+  - name: "openwisp2-debian12"
+    image: "geerlingguy/docker-debian12-ansible:latest"
+    command: ${MOLECULE_DOCKER_COMMAND:-""}
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+    cgroupns_mode: host
+    privileged: true
+    pre_build_image: true
 # TODO: Add platforms for RHEL 7 and 8
 provisioner:
   name: ansible
@@ -41,7 +57,6 @@ provisioner:
     verify: ../resources/verify.yml
   config_options:
     defaults:
-      stdout_callback: yaml
       bin_ansible_callbacks: true
 verifier:
   name: ansible