Merge pull request #116 from cisagov/improvement/add-support-for-hw-platforms

Explicitly specify the hardware platforms for the various Molecule platforms

Author: mcdonnnj

molecule/default/molecule-no-systemd.yml

@@ -16,31 +16,43 @@ lint: |
   ansible-lint
   flake8
 platforms:
-  - name: amazonlinux2
-    image: amazonlinux:2
-  - name: debian9
+  - image: amazonlinux:2
+    name: amazonlinux2
+    platform: amd64
+  - dockerfile: Dockerfile_debian_9.j2
     image: debian:stretch-slim
-    dockerfile: Dockerfile_debian_9.j2
-  - name: debian10
-    image: debian:buster-slim
-  - name: debian11
-    image: debian:bullseye-slim
-  - name: debian12
-    image: debian:bookworm-slim
-  - name: kali
-    image: kalilinux/kali-rolling
-  - name: fedora35
-    image: fedora:35
-  - name: fedora36
-    image: fedora:36
-  - name: fedora37
-    image: fedora:37
-  - name: ubuntu18
-    image: ubuntu:bionic
-  - name: ubuntu20
-    image: ubuntu:focal
-  - name: ubuntu22
-    image: ubuntu:jammy
+    name: debian9
+    platform: amd64
+  - image: debian:buster-slim
+    name: debian10
+    platform: amd64
+  - image: debian:bullseye-slim
+    name: debian11
+    platform: amd64
+  - image: debian:bookworm-slim
+    name: debian12
+    platform: amd64
+  - image: kalilinux/kali-rolling
+    name: kali
+    platform: amd64
+  - image: fedora:35
+    name: fedora35
+    platform: amd64
+  - image: fedora:36
+    name: fedora36
+    platform: amd64
+  - image: fedora:37
+    name: fedora37
+    platform: amd64
+  - image: ubuntu:bionic
+    name: ubuntu18
+    platform: amd64
+  - image: ubuntu:focal
+    name: ubuntu20
+    platform: amd64
+  - image: ubuntu:jammy
+    name: ubuntu22
+    platform: amd64
 provisioner:
   name: ansible
   inventory:

molecule/default/molecule-with-systemd.yml

@@ -15,90 +15,102 @@ lint: |
   ansible-lint
   flake8
 platforms:
-  - name: amazonlinux2-systemd
+  - command: /lib/systemd/systemd
     image: geerlingguy/docker-amazonlinux2-ansible:latest
+    name: amazonlinux2-systemd
+    platform: amd64
+    pre_build_image: yes
     privileged: yes
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
-    command: /lib/systemd/systemd
-    pre_build_image: yes
-  - name: debian9-systemd
+  - command: /lib/systemd/systemd
     image: geerlingguy/docker-debian9-ansible:latest
+    name: debian9-systemd
+    platform: amd64
+    pre_build_image: yes
     privileged: yes
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
-    command: /lib/systemd/systemd
-    pre_build_image: yes
-  - name: debian10-systemd
+  - command: /lib/systemd/systemd
     image: geerlingguy/docker-debian10-ansible:latest
+    name: debian10-systemd
+    platform: amd64
+    pre_build_image: yes
     privileged: yes
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
-    command: /lib/systemd/systemd
-    pre_build_image: yes
-  - name: debian11-systemd
+  - command: /lib/systemd/systemd
     image: geerlingguy/docker-debian11-ansible:latest
+    name: debian11-systemd
+    platform: amd64
+    pre_build_image: yes
     privileged: yes
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
-    command: /lib/systemd/systemd
-    pre_build_image: yes
-  - name: debian12-systemd
+  - command: /lib/systemd/systemd
     image: cisagov/docker-debian12-ansible:latest
+    name: debian12-systemd
+    platform: amd64
+    pre_build_image: yes
     privileged: yes
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
-    command: /lib/systemd/systemd
-    pre_build_image: yes
-  - name: kali-systemd
+  - command: /lib/systemd/systemd
     image: cisagov/docker-kali-ansible:latest
+    name: kali-systemd
+    platform: amd64
+    pre_build_image: yes
     privileged: yes
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
-    command: /lib/systemd/systemd
-    pre_build_image: yes
-  - name: fedora35-systemd
+  - command: /lib/systemd/systemd
     image: geerlingguy/docker-fedora35-ansible:latest
+    name: fedora35-systemd
+    platform: amd64
+    pre_build_image: yes
     privileged: yes
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
-    command: /lib/systemd/systemd
-    pre_build_image: yes
-  - name: fedora36-systemd
+  - command: /lib/systemd/systemd
     image: geerlingguy/docker-fedora36-ansible:latest
+    name: fedora36-systemd
+    platform: amd64
+    pre_build_image: yes
     privileged: yes
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
-    command: /lib/systemd/systemd
-    pre_build_image: yes
-  - name: fedora37-systemd
+  - command: /lib/systemd/systemd
     image: geerlingguy/docker-fedora37-ansible:latest
+    name: fedora37-systemd
+    platform: amd64
+    pre_build_image: yes
     privileged: yes
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
-    command: /lib/systemd/systemd
-    pre_build_image: yes
-  - name: ubuntu-18-systemd
+  - command: /lib/systemd/systemd
     image: geerlingguy/docker-ubuntu1804-ansible:latest
+    name: ubuntu-18-systemd
+    platform: amd64
+    pre_build_image: yes
     privileged: yes
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
-    command: /lib/systemd/systemd
-    pre_build_image: yes
-  - name: ubuntu-20-systemd
+  - command: /lib/systemd/systemd
     image: geerlingguy/docker-ubuntu2004-ansible:latest
+    name: ubuntu-20-systemd
+    platform: amd64
+    pre_build_image: yes
     privileged: yes
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
-    command: /lib/systemd/systemd
-    pre_build_image: yes
-  - name: ubuntu-22-systemd
+  - command: /lib/systemd/systemd
     image: geerlingguy/docker-ubuntu2204-ansible:latest
+    name: ubuntu-22-systemd
+    platform: amd64
+    pre_build_image: yes
     privileged: yes
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
-    command: /lib/systemd/systemd
-    pre_build_image: yes
 provisioner:
   name: ansible
   inventory: