Remove redundant -amd64 from Molecule platform names

Author: jsf9k

molecule/default/molecule-no-systemd.yml

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

molecule/default/molecule-with-systemd.yml

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