Merge https://github.com/cisagov/skeleton-ansible-role into lineage/skeleton

# Conflicts:
#	.config/molecule/config.yml
#	.github/workflows/build.yml
#	meta/main.yml

Author: jsf9k

.config/molecule/config.yml

@@ -113,42 +113,6 @@ platforms:
     privileged: true
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
-  - cgroupns_mode: host
-    command: /lib/systemd/systemd
-    image: docker.io/geerlingguy/docker-fedora39-ansible:latest
-    name: fedora39-systemd-amd64
-    platform: amd64
-    pre_build_image: true
-    privileged: true
-    volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:rw
-  - cgroupns_mode: host
-    command: /lib/systemd/systemd
-    image: docker.io/geerlingguy/docker-fedora39-ansible:latest
-    name: fedora39-systemd-arm64
-    platform: arm64
-    pre_build_image: true
-    privileged: true
-    volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:rw
-  - cgroupns_mode: host
-    command: /lib/systemd/systemd
-    image: docker.io/geerlingguy/docker-fedora40-ansible:latest
-    name: fedora40-systemd-amd64
-    platform: amd64
-    pre_build_image: true
-    privileged: true
-    volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:rw
-  - cgroupns_mode: host
-    command: /lib/systemd/systemd
-    image: docker.io/geerlingguy/docker-fedora40-ansible:latest
-    name: fedora40-systemd-arm64
-    platform: arm64
-    pre_build_image: true
-    privileged: true
-    volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:rw
   - cgroupns_mode: host
     command: /lib/systemd/systemd
     image: docker.io/geerlingguy/docker-fedora41-ansible:latest
@@ -167,6 +131,7 @@ platforms:
     privileged: true
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
+<<<<<<< HEAD
   # These platforms do not provide systemd-resolved.
   # - cgroupns_mode: host
   #   command: /lib/systemd/systemd
@@ -204,6 +169,44 @@ platforms:
   #   privileged: true
   #   volumes:
   #     - /sys/fs/cgroup:/sys/fs/cgroup:rw
+=======
+  - cgroupns_mode: host
+    command: /lib/systemd/systemd
+    image: docker.io/geerlingguy/docker-fedora42-ansible:latest
+    name: fedora42-systemd-amd64
+    platform: amd64
+    pre_build_image: true
+    privileged: true
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+  - cgroupns_mode: host
+    command: /lib/systemd/systemd
+    image: docker.io/geerlingguy/docker-fedora42-ansible:latest
+    name: fedora42-systemd-arm64
+    platform: arm64
+    pre_build_image: true
+    privileged: true
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+  - cgroupns_mode: host
+    command: /lib/systemd/systemd
+    image: docker.io/geerlingguy/docker-ubuntu2204-ansible:latest
+    name: ubuntu-22-systemd-amd64
+    platform: amd64
+    pre_build_image: true
+    privileged: true
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+  - cgroupns_mode: host
+    command: /lib/systemd/systemd
+    image: docker.io/geerlingguy/docker-ubuntu2204-ansible:latest
+    name: ubuntu-22-systemd-arm64
+    platform: arm64
+    pre_build_image: true
+    privileged: true
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+>>>>>>> 54e395efa2409780c0574d266fe68bce1c9b7060
   - cgroupns_mode: host
     command: /lib/systemd/systemd
     image: docker.io/geerlingguy/docker-ubuntu2404-ansible:latest

.github/workflows/build.yml

@@ -222,13 +222,16 @@ jobs:
           # - debian11-systemd
           - debian12-systemd
           - debian13-systemd
-          - fedora39-systemd
-          - fedora40-systemd
           - fedora41-systemd
+          - fedora42-systemd
           - kali-systemd
+<<<<<<< HEAD
           # These platforms do not provide systemd-resolved.
           # - ubuntu-20-systemd
           # - ubuntu-22-systemd
+=======
+          - ubuntu-22-systemd
+>>>>>>> 54e395efa2409780c0574d266fe68bce1c9b7060
           - ubuntu-24-systemd
         scenario:
           - default

.pre-commit-config.yaml

@@ -173,7 +173,7 @@ repos:
 
   # Ansible hooks
   - repo: https://github.com/ansible/ansible-lint
-    rev: v25.1.3
+    rev: v25.4.0
     hooks:
       - id: ansible-lint
         additional_dependencies:

meta/main.yml

@@ -34,17 +34,20 @@ galaxy_info:
         - trixie
     - name: Fedora
       versions:
-        - "39"
-        - "40"
         - "41"
+        - "42"
     - name: Kali
       versions:
         - "2023"
     - name: Ubuntu
       versions:
+<<<<<<< HEAD
         # These platforms do not provide systemd-resolved.
         # - focal
         # - jammy
+=======
+        - jammy
+>>>>>>> 54e395efa2409780c0574d266fe68bce1c9b7060
         - noble
   role_name: systemd_resolved
   standalone: true

version.txt

@@ -1 +1 @@
-1.0.0
+2.0.0