diff options
| -rw-r--r-- | .github/workflows/ci.yml | 5 | ||||
| -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 | ||||
| -rw-r--r-- | roles/bootstrap/meta/main.yml | 1 | ||||
| -rw-r--r-- | roles/configure/meta/main.yml | 1 | ||||
| -rw-r--r-- | roles/partition/meta/main.yml | 1 |
7 files changed, 37 insertions, 2 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3c5f623..447a544 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,7 +32,10 @@ jobs: - distro: archlinux platform: "linux/amd64" runs_on: "ubuntu-latest" - - distro: ubuntu + - distro: ubuntu-noble + platform: "linux/amd64" + runs_on: "ubuntu-latest" + - distro: ubuntu-resolute platform: "linux/amd64" runs_on: "ubuntu-latest" - distro: proxmox 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" diff --git a/roles/bootstrap/meta/main.yml b/roles/bootstrap/meta/main.yml index ab91fe0..b9f32a7 100644 --- a/roles/bootstrap/meta/main.yml +++ b/roles/bootstrap/meta/main.yml @@ -14,6 +14,7 @@ galaxy_info: - name: Ubuntu versions: - noble + - resolute - name: Debian versions: - bookworm diff --git a/roles/configure/meta/main.yml b/roles/configure/meta/main.yml index 9ded710..d4f2909 100644 --- a/roles/configure/meta/main.yml +++ b/roles/configure/meta/main.yml @@ -13,6 +13,7 @@ galaxy_info: - name: Ubuntu versions: - noble + - resolute - name: Debian versions: - bookworm diff --git a/roles/partition/meta/main.yml b/roles/partition/meta/main.yml index e124bb7..6916e58 100644 --- a/roles/partition/meta/main.yml +++ b/roles/partition/meta/main.yml @@ -13,6 +13,7 @@ galaxy_info: - name: Ubuntu versions: - noble + - resolute - name: Debian versions: - bookworm |