diff options
| author | Ahmed Abdelhalim <[email protected]> | 2026-05-07 12:05:55 +0200 |
|---|---|---|
| committer | Ahmed Abdelhalim <[email protected]> | 2026-05-07 12:16:54 +0200 |
| commit | 3698f8103a053085c84f9c48fa450de4aa979f84 (patch) | |
| tree | 157a6985a97742e9ee6a4c8251072e6147e360e3 /molecule | |
| parent | de4eb5c348a7b5dd39ae2825125fd2ba431c4d03 (diff) | |
Add testing for ubuntu 26.4
Diffstat (limited to 'molecule')
| -rw-r--r-- | molecule/default/Dockerfile.ubuntu-noble.j2 (renamed from molecule/default/Dockerfile.ubuntu.j2) | 0 | ||||
| -rw-r--r-- | molecule/default/Dockerfile.ubuntu-resolute.j2 | 27 | ||||
| -rw-r--r-- | molecule/default/prepare.yml | 4 |
3 files changed, 30 insertions, 1 deletions
diff --git a/molecule/default/Dockerfile.ubuntu.j2 b/molecule/default/Dockerfile.ubuntu-noble.j2 index 63ceca0..63ceca0 100644 --- a/molecule/default/Dockerfile.ubuntu.j2 +++ b/molecule/default/Dockerfile.ubuntu-noble.j2 diff --git a/molecule/default/Dockerfile.ubuntu-resolute.j2 b/molecule/default/Dockerfile.ubuntu-resolute.j2 new file mode 100644 index 0000000..1e52cb3 --- /dev/null +++ b/molecule/default/Dockerfile.ubuntu-resolute.j2 @@ -0,0 +1,27 @@ +# Based on the amazing work of geerlingguy <3 +# FROM docker.io/geerlingguy/docker-ubuntu2404-ansible +FROM docker.io/library/ubuntu:resolute + +ARG DEBIAN_FRONTEND=noninteractive + +ENV container docker + +RUN apt-get update \ + && apt-get install -y --no-install-recommends \ + locales systemd python3 parted dosfstools \ + && apt-get clean \ + && rm -Rf /var/lib/apt/lists/* \ + && rm -Rf /usr/share/doc \ + && rm -Rf /usr/share/man + +# Fix potential UTF-8 errors with ansible-test. +RUN locale-gen en_US.UTF-8 + +# Remove unnecessary getty and udev targets that result in high CPU usage when using +# multiple containers with Molecule (https://github.com/ansible/molecule/issues/1104) +RUN rm -f /lib/systemd/system/systemd*udev* \ + && rm -f /lib/systemd/system/getty.target + +VOLUME ["/sys/fs/cgroup", "/tmp", "/run", "/opt"] + +CMD ["/lib/systemd/systemd"] diff --git a/molecule/default/prepare.yml b/molecule/default/prepare.yml index 76b7787..6347834 100644 --- a/molecule/default/prepare.yml +++ b/molecule/default/prepare.yml @@ -8,7 +8,9 @@ scenario_vars: archlinux: hostname: "desktop.local" - ubuntu: + ubuntu-noble: + hostname: "laptop.local" + ubuntu-resolute: hostname: "laptop.local" raspberrypi: hostname: "rpi5.local" |
